Piteball/android_kernel_samsung_msm8976
1
1
Fork 0
mirror of https://github.com/team-infusion-developers/android_kernel_samsung_msm8976.git synced 2024-11-07 04:09:21 +00:00
Code Issues Projects Releases Wiki Activity

fs: Merge split strings

Browse source 
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>
This commit is contained in:
Jean Delvare 2011-07-16 18:10:35 +02:00 committed by Jiri Kosina
parent 497888cf69
commit df2e301fee
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
fs/ecryptfs/keystore.c
View file

@ -2248,7 +2248,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
auth_tok->token.password.session_key_encryption_key, auth_tok->token.password.session_key_encryption_key,
crypt_stat->key_size); crypt_stat->key_size);
ecryptfs_printk(KERN_DEBUG, ecryptfs_printk(KERN_DEBUG,
"Cached session key " "encryption key: \n"); "Cached session key encryption key:\n");
if (ecryptfs_verbosity > 0) if (ecryptfs_verbosity > 0)
ecryptfs_dump_hex(session_key_encryption_key, 16); ecryptfs_dump_hex(session_key_encryption_key, 16);
} }

2
fs/jffs2/readinode.c
View file

@ -1041,7 +1041,7 @@ static int jffs2_get_inode_nodes(struct jffs2_sb_info *c, struct jffs2_inode_inf
/* FIXME: point() */ /* FIXME: point() */
err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf); err = jffs2_flash_read(c, ref_offset(ref), len, &retlen, buf);
if (err) { 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; goto free_out;
} }

2
fs/xfs/xfs_dir2_node.c
View file

@ -1641,7 +1641,7 @@ xfs_dir2_node_addname_int(
if (unlikely(xfs_dir2_db_to_fdb(mp, dbno) != fbno)) { if (unlikely(xfs_dir2_db_to_fdb(mp, dbno) != fbno)) {
xfs_alert(mp, 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", " data block %lld, got %lld ifbno %llu lastfbno %d",
__func__, (unsigned long long)dp->i_ino, __func__, (unsigned long long)dp->i_ino,
(long long)xfs_dir2_db_to_fdb(mp, dbno), (long long)xfs_dir2_db_to_fdb(mp, dbno),