summaryrefslogtreecommitdiffstats
path: root/mm/shmem.c
diff options
context:
space:
mode:
authorAl Viro <viro@zeniv.linux.org.uk>2014-02-02 22:18:22 -0500
committerAl Viro <viro@zeniv.linux.org.uk>2014-04-01 23:19:20 -0400
commit8142c184b8f16d213eb8ba06ccb6222259a51cfc (patch)
tree40c818c697edbc0452e3d48006b6f7584c3217f3 /mm/shmem.c
parent9e8c2af96e0d2d5fe298dd796fb6bc16e888a48d (diff)
downloadop-kernel-dev-8142c184b8f16d213eb8ba06ccb6222259a51cfc.zip
op-kernel-dev-8142c184b8f16d213eb8ba06ccb6222259a51cfc.tar.gz
do_shmem_file_read(): call file_read_actor() directly
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'mm/shmem.c')
-rw-r--r--mm/shmem.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/mm/shmem.c b/mm/shmem.c
index 1f18c9d..9398e6c 100644
--- a/mm/shmem.c
+++ b/mm/shmem.c
@@ -1462,7 +1462,7 @@ shmem_write_end(struct file *file, struct address_space *mapping,
return copied;
}
-static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc, read_actor_t actor)
+static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_t *desc)
{
struct inode *inode = file_inode(filp);
struct address_space *mapping = inode->i_mapping;
@@ -1550,7 +1550,7 @@ static void do_shmem_file_read(struct file *filp, loff_t *ppos, read_descriptor_
* "pos" here (the actor routine has to update the user buffer
* pointers and the remaining count).
*/
- ret = actor(desc, page, offset, nr);
+ ret = file_read_actor(desc, page, offset, nr);
offset += ret;
index += offset >> PAGE_CACHE_SHIFT;
offset &= ~PAGE_CACHE_MASK;
@@ -1588,7 +1588,7 @@ static ssize_t shmem_file_aio_read(struct kiocb *iocb,
if (desc.count == 0)
continue;
desc.error = 0;
- do_shmem_file_read(filp, ppos, &desc, file_read_actor);
+ do_shmem_file_read(filp, ppos, &desc);
retval += desc.written;
if (desc.error) {
retval = retval ?: desc.error;
OpenPOWER on IntegriCloud