aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs
diff options
context:
space:
mode:
authorJean Delvare <khali@linux-fr.org>2011-07-16 12:10:35 -0400
committerJiri Kosina <jkosina@suse.cz>2011-07-22 10:47:15 -0400
commitdf2e301fee3c2c2a87592151397ad7699bb14c37 (patch)
tree09364e1443d8cac6c415af5e8d07b2b37793b68e /fs/ecryptfs
parent497888cf69bf607ac1fe061a6437e0a670b0022f (diff)
fs: Merge split strings
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>
Diffstat (limited to 'fs/ecryptfs')
-rw-r--r--fs/ecryptfs/keystore.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ecryptfs/keystore.c b/fs/ecryptfs/keystore.c
index 27a7fefb83eb..fa8049ecdc64 100644
--- a/fs/ecryptfs/keystore.c
+++ b/fs/ecryptfs/keystore.c
@@ -2248,7 +2248,7 @@ write_tag_3_packet(char *dest, size_t *remaining_bytes,
2248 auth_tok->token.password.session_key_encryption_key, 2248 auth_tok->token.password.session_key_encryption_key,
2249 crypt_stat->key_size); 2249 crypt_stat->key_size);
2250 ecryptfs_printk(KERN_DEBUG, 2250 ecryptfs_printk(KERN_DEBUG,
2251 "Cached session key " "encryption key: \n"); 2251 "Cached session key encryption key:\n");
2252 if (ecryptfs_verbosity > 0) 2252 if (ecryptfs_verbosity > 0)
2253 ecryptfs_dump_hex(session_key_encryption_key, 16); 2253 ecryptfs_dump_hex(session_key_encryption_key, 16);
2254 } 2254 }