summaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/file.c
diff options
context:
space:
mode:
authorMichael Halcrow <mike@halcrow.us>2008-02-06 10:38:35 +0100
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2008-02-06 19:41:12 +0100
commit25bd8174036036f427b039e4857feac6c6912a37 (patch)
tree89c15ca0adb40cd5b4c00b627de74d342a851fa4 /fs/ecryptfs/file.c
parentecryptfs: remove debug as mount option, and warn if set via modprobe (diff)
downloadlinux-25bd8174036036f427b039e4857feac6c6912a37.tar.xz
linux-25bd8174036036f427b039e4857feac6c6912a37.zip
eCryptfs: Minor fixes to printk messages
The printk statements that result when the user does not have the proper key available could use some refining. Signed-off-by: Mike Halcrow <mhalcrow@us.ibm.com> Cc: Mike Halcrow <mhalcrow@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Diffstat (limited to 'fs/ecryptfs/file.c')
-rw-r--r--fs/ecryptfs/file.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index c98c4690a771..2b8f5ed4adea 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -209,9 +209,10 @@ static int ecryptfs_open(struct inode *inode, struct file *file)
if (!(mount_crypt_stat->flags
& ECRYPTFS_PLAINTEXT_PASSTHROUGH_ENABLED)) {
rc = -EIO;
- printk(KERN_WARNING "Attempt to read file that "
+ printk(KERN_WARNING "Either the lower file "
"is not in a valid eCryptfs format, "
- "and plaintext passthrough mode is not "
+ "or the key could not be retrieved. "
+ "Plaintext passthrough mode is not "
"enabled; returning -EIO\n");
mutex_unlock(&crypt_stat->cs_mutex);
goto out_free;