fs: Merge split strings
Jean Delvare [Sat, 16 Jul 2011 16:10:35 +0000 (18:10 +0200)]
No idea why these were split in the first place...

Signed-off-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>

fs/ecryptfs/keystore.c
fs/jffs2/readinode.c
fs/xfs/xfs_dir2_node.c

index 27a7fef..fa8049e 100644 (file)
@@ -2248,7 +2248,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
                       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);
        }
index 2ab1a0d..ee57bac 100644 (file)
@@ -1041,7 +1041,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
                /* 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;
                }
 
index a0aab7d..702d436 100644 (file)
@@ -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),