diff options
Diffstat (limited to 'fs/ecryptfs/file.c')
-rw-r--r-- | fs/ecryptfs/file.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c index b1eaa7a1f82c..b32827c917e1 100644 --- a/fs/ecryptfs/file.c +++ b/fs/ecryptfs/file.c | |||
@@ -45,14 +45,13 @@ | |||
45 | * The function to be used for directory reads is ecryptfs_read. | 45 | * The function to be used for directory reads is ecryptfs_read. |
46 | */ | 46 | */ |
47 | static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, | 47 | static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, |
48 | const struct iovec *iov, | 48 | struct iov_iter *to) |
49 | unsigned long nr_segs, loff_t pos) | ||
50 | { | 49 | { |
51 | ssize_t rc; | 50 | ssize_t rc; |
52 | struct path *path; | 51 | struct path *path; |
53 | struct file *file = iocb->ki_filp; | 52 | struct file *file = iocb->ki_filp; |
54 | 53 | ||
55 | rc = generic_file_aio_read(iocb, iov, nr_segs, pos); | 54 | rc = generic_file_read_iter(iocb, to); |
56 | /* | 55 | /* |
57 | * Even though this is a async interface, we need to wait | 56 | * Even though this is a async interface, we need to wait |
58 | * for IO to finish to update atime | 57 | * for IO to finish to update atime |
@@ -352,8 +351,8 @@ const struct file_operations ecryptfs_dir_fops = { | |||
352 | 351 | ||
353 | const struct file_operations ecryptfs_main_fops = { | 352 | const struct file_operations ecryptfs_main_fops = { |
354 | .llseek = generic_file_llseek, | 353 | .llseek = generic_file_llseek, |
355 | .read = do_sync_read, | 354 | .read = new_sync_read, |
356 | .aio_read = ecryptfs_read_update_atime, | 355 | .read_iter = ecryptfs_read_update_atime, |
357 | .write = do_sync_write, | 356 | .write = do_sync_write, |
358 | .aio_write = generic_file_aio_write, | 357 | .aio_write = generic_file_aio_write, |
359 | .iterate = ecryptfs_readdir, | 358 | .iterate = ecryptfs_readdir, |