linux-kernel - [PATCH] fs: Merge split strings

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <20110716181035.7db8d8f0@endymion.delvare>
Date:	Sat, 16 Jul 2011 18:10:35 +0200
From:	Jean Delvare <khali@...ux-fr.org>
To:	trivial@...nel.org, LKML <linux-kernel@...r.kernel.org>
Cc:	Tyler Hicks <tyhicks@...ux.vnet.ibm.com>,
	Dustin Kirkland <kirkland@...onical.com>,
	David Woodhouse <dwmw2@...radead.org>,
	Alex Elder <aelder@....com>,
	Andrew Morton <akpm@...ux-foundation.org>
Subject: [PATCH] fs: Merge split strings

No idea why these were split in the first place...

Signed-off-by: Jean Delvare <khali@...ux-fr.org>
---
 fs/ecryptfs/keystore.c |    2 +-
 fs/jffs2/readinode.c   |    2 +-
 fs/xfs/xfs_dir2_node.c |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

--- linux-3.0-rc5.orig/fs/ecryptfs/keystore.c	2011-05-30 20:45:21.000000000 +0200
+++ linux-3.0-rc5/fs/ecryptfs/keystore.c	2011-07-04 13:16:53.000000000 +0200
@@ -2248,7 +2248,7 @@ write_tag_3_packet(char *dest, size_t *r
 		       auth_tok->token.password.session_key_encryption_key,
 		       crypt_stat->key_size);
 		ecryptfs_printk(KERN_DEBUG,
-				"Cached session key " "encryption key: \n");
+				"Cached session key encryption key:\n");
 		if (ecryptfs_verbosity > 0)
 			ecryptfs_dump_hex(session_key_encryption_key, 16);
 	}
--- linux-3.0-rc5.orig/fs/jffs2/readinode.c	2011-05-20 10:42:43.000000000 +0200
+++ linux-3.0-rc5/fs/jffs2/readinode.c	2011-07-04 13:19:26.000000000 +0200
@@ -1041,7 +1041,7 @@ static int jffs2_get_inode_nodes(struct
 		/* FIXME: point() */
 		err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf);
 		if (err) {
-			JFFS2_ERROR("can not read %d bytes from 0x%08x, " "error code: %d.\n", len, ref_offset(ref), err);
+			JFFS2_ERROR("can not read %d bytes from 0x%08x, error code: %d.\n", len, ref_offset(ref), err);
 			goto free_out;
 		}
 
--- linux-3.0-rc5.orig/fs/xfs/xfs_dir2_node.c	2011-05-20 10:42:44.000000000 +0200
+++ linux-3.0-rc5/fs/xfs/xfs_dir2_node.c	2011-07-04 13:19:58.000000000 +0200
@@ -1641,7 +1641,7 @@ xfs_dir2_node_addname_int(
 
 			if (unlikely(xfs_dir2_db_to_fdb(mp, dbno) != fbno)) {
 				xfs_alert(mp,
-			"%s: dir ino " "%llu needed freesp block %lld for\n"
+			"%s: dir ino %llu needed freesp block %lld for\n"
 			"  data block %lld, got %lld ifbno %llu lastfbno %d",
 					__func__, (unsigned long long)dp->i_ino,
 					(long long)xfs_dir2_db_to_fdb(mp, dbno),


-- 
Jean Delvare
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/