Commit df2e301f authored by Jean Delvare's avatar Jean Delvare Committed by Jiri Kosina
Browse files

fs: Merge split strings 



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

Signed-off-by: default avatarJean Delvare <khali@linux-fr.org>
Signed-off-by: default avatarJiri Kosina <jkosina@suse.cz>
parent 497888cf

fs/ecryptfs/keystore.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

	}

fs/jffs2/readinode.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

		}

fs/xfs/xfs_dir2_node.c

+1 −1
Original line number Diff line number Diff line
@@ -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),