diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2014-04-02 22:40:38 +0400 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2014-05-07 01:37:56 +0400 |
| commit | 027978295d455b2fdff0cb36570f83ada7385ea6 (patch) | |
| tree | 74da59ed2b1708160a3ea7aa4da290d5e8d741b6 /fs/ecryptfs/file.c | |
| parent | b4f5d2c6d1f88c79e48f1296076b3a6a22f58c0f (diff) | |
| download | linux-027978295d455b2fdff0cb36570f83ada7385ea6.tar.xz | |
ecryptfs: switch to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
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 @@ * The function to be used for directory reads is ecryptfs_read. */ static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb, - const struct iovec *iov, - unsigned long nr_segs, loff_t pos) + struct iov_iter *to) { ssize_t rc; struct path *path; struct file *file = iocb->ki_filp; - rc = generic_file_aio_read(iocb, iov, nr_segs, pos); + rc = generic_file_read_iter(iocb, to); /* * Even though this is a async interface, we need to wait * for IO to finish to update atime @@ -352,8 +351,8 @@ const struct file_operations ecryptfs_dir_fops = { const struct file_operations ecryptfs_main_fops = { .llseek = generic_file_llseek, - .read = do_sync_read, - .aio_read = ecryptfs_read_update_atime, + .read = new_sync_read, + .read_iter = ecryptfs_read_update_atime, .write = do_sync_write, .aio_write = generic_file_aio_write, .iterate = ecryptfs_readdir, |