aboutsummaryrefslogtreecommitdiffstats
path: root/fs/ecryptfs/file.c
diff options
context:
space:
mode:
authorMichael Halcrow <mhalcrow@us.ibm.com>2007-10-16 04:28:04 -0400
committerLinus Torvalds <torvalds@woody.linux-foundation.org>2007-10-16 12:43:12 -0400
commite9f6a99cb844a61b04cab5b82e333d6efef1f735 (patch)
tree1e7c20b39f1bfe3c583b27d1fd74ff988c754dd9 /fs/ecryptfs/file.c
parentcd9d67dfd2b4db5fdbf9dfa69e202b8571f1db20 (diff)
eCryptfs: Use generic_file_splice_read()
eCryptfs is currently just passing through splice reads to the lower filesystem. This is obviously incorrect behavior; the decrypted data is what needs to be read, not the lower encrypted data. I cannot think of any good reason for eCryptfs to implement splice_read, so this patch points the eCryptfs fops splice_read to use generic_file_splice_read. Signed-off-by: Michael Halcrow <mhalcrow@us.ibm.com> Reviewed-by: Jens Axboe <jens.axboe@oracle.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.c19
1 files changed, 2 insertions, 17 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index 94f456fe4d9b..12ba7e3a69f9 100644
--- a/fs/ecryptfs/file.c
+++ b/fs/ecryptfs/file.c
@@ -338,21 +338,6 @@ static int ecryptfs_fasync(int fd, struct file *file, int flag)
338 return rc; 338 return rc;
339} 339}
340 340
341static ssize_t ecryptfs_splice_read(struct file *file, loff_t * ppos,
342 struct pipe_inode_info *pipe, size_t count,
343 unsigned int flags)
344{
345 struct file *lower_file = NULL;
346 int rc = -EINVAL;
347
348 lower_file = ecryptfs_file_to_lower(file);
349 if (lower_file->f_op && lower_file->f_op->splice_read)
350 rc = lower_file->f_op->splice_read(lower_file, ppos, pipe,
351 count, flags);
352
353 return rc;
354}
355
356static int ecryptfs_ioctl(struct inode *inode, struct file *file, 341static int ecryptfs_ioctl(struct inode *inode, struct file *file,
357 unsigned int cmd, unsigned long arg); 342 unsigned int cmd, unsigned long arg);
358 343
@@ -365,7 +350,7 @@ const struct file_operations ecryptfs_dir_fops = {
365 .release = ecryptfs_release, 350 .release = ecryptfs_release,
366 .fsync = ecryptfs_fsync, 351 .fsync = ecryptfs_fsync,
367 .fasync = ecryptfs_fasync, 352 .fasync = ecryptfs_fasync,
368 .splice_read = ecryptfs_splice_read, 353 .splice_read = generic_file_splice_read,
369}; 354};
370 355
371const struct file_operations ecryptfs_main_fops = { 356const struct file_operations ecryptfs_main_fops = {
@@ -382,7 +367,7 @@ const struct file_operations ecryptfs_main_fops = {
382 .release = ecryptfs_release, 367 .release = ecryptfs_release,
383 .fsync = ecryptfs_fsync, 368 .fsync = ecryptfs_fsync,
384 .fasync = ecryptfs_fasync, 369 .fasync = ecryptfs_fasync,
385 .splice_read = ecryptfs_splice_read, 370 .splice_read = generic_file_splice_read,
386}; 371};
387 372
388static int 373static int