summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-04-02 14:40:38 -0400
committerAl Viro <viro@zeniv.linux.org.uk>2014-05-06 17:37:56 -0400
commit027978295d455b2fdff0cb36570f83ada7385ea6 (patch)
tree74da59ed2b1708160a3ea7aa4da290d5e8d741b6
parentb4f5d2c6d1f88c79e48f1296076b3a6a22f58c0f (diff)
downloadop-kernel-dev-027978295d455b2fdff0cb36570f83ada7385ea6.zip
op-kernel-dev-027978295d455b2fdff0cb36570f83ada7385ea6.tar.gz
ecryptfs: switch to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
-rw-r--r--fs/ecryptfs/file.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/fs/ecryptfs/file.c b/fs/ecryptfs/file.c
index b1eaa7a..b32827c 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,
OpenPOWER on IntegriCloud