|
@@ -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,
|