ecryptfs: switch to ->read_iter()
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
This commit is contained in:
Родитель
b4f5d2c6d1
Коммит
027978295d
|
@ -45,14 +45,13 @@
|
||||||
* The function to be used for directory reads is ecryptfs_read.
|
* The function to be used for directory reads is ecryptfs_read.
|
||||||
*/
|
*/
|
||||||
static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
|
static ssize_t ecryptfs_read_update_atime(struct kiocb *iocb,
|
||||||
const struct iovec *iov,
|
struct iov_iter *to)
|
||||||
unsigned long nr_segs, loff_t pos)
|
|
||||||
{
|
{
|
||||||
ssize_t rc;
|
ssize_t rc;
|
||||||
struct path *path;
|
struct path *path;
|
||||||
struct file *file = iocb->ki_filp;
|
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
|
* Even though this is a async interface, we need to wait
|
||||||
* for IO to finish to update atime
|
* 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 = {
|
const struct file_operations ecryptfs_main_fops = {
|
||||||
.llseek = generic_file_llseek,
|
.llseek = generic_file_llseek,
|
||||||
.read = do_sync_read,
|
.read = new_sync_read,
|
||||||
.aio_read = ecryptfs_read_update_atime,
|
.read_iter = ecryptfs_read_update_atime,
|
||||||
.write = do_sync_write,
|
.write = do_sync_write,
|
||||||
.aio_write = generic_file_aio_write,
|
.aio_write = generic_file_aio_write,
|
||||||
.iterate = ecryptfs_readdir,
|
.iterate = ecryptfs_readdir,
|
||||||
|
|
Загрузка…
Ссылка в новой задаче