remove call_{read,write}_iter() functions

These have no clear purpose.  This is effectively a revert of commit
bb7462b6fd64 ("vfs: use helpers for calling f_op->{read,write}_iter()").

The patch was created with the help of a coccinelle script.

Fixes: bb7462b6fd64 ("vfs: use helpers for calling f_op->{read,write}_iter()")
Reviewed-by: Christian Brauner <brauner@kernel.org>
Signed-off-by: Miklos Szeredi <mszeredi@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>

diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index 28a95fd366fea5741db9d72b34afc6ddc6d0890a..93780f41646b75cca0d572ee9a7c5e89a153e0b0 100644 (file)
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -445,9 +445,9 @@ static int lo_rw_aio(struct loop_device *lo, struct loop_cmd *cmd,
        cmd->iocb.ki_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_NONE, 0);
 
        if (rw == ITER_SOURCE)
-               ret = call_write_iter(file, &cmd->iocb, &iter);
+               ret = file->f_op->write_iter(&cmd->iocb, &iter);
        else
-               ret = call_read_iter(file, &cmd->iocb, &iter);
+               ret = file->f_op->read_iter(&cmd->iocb, &iter);
 
        lo_rw_aio_do_completion(cmd);
 

diff --git a/drivers/target/target_core_file.c b/drivers/target/target_core_file.c
index 4d447520bab87d6133ba2611f37c4955e641fe5c..94e6cd4e7e43dff4ca6b641528311ba42d441717 100644 (file)
--- a/drivers/target/target_core_file.c
+++ b/drivers/target/target_core_file.c
@@ -299,9 +299,9 @@ fd_execute_rw_aio(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
                aio_cmd->iocb.ki_flags |= IOCB_DSYNC;
 
        if (is_write)
-               ret = call_write_iter(file, &aio_cmd->iocb, &iter);
+               ret = file->f_op->write_iter(&aio_cmd->iocb, &iter);
        else
-               ret = call_read_iter(file, &aio_cmd->iocb, &iter);
+               ret = file->f_op->read_iter(&aio_cmd->iocb, &iter);
 
        if (ret != -EIOCBQUEUED)
                cmd_rw_aio_complete(&aio_cmd->iocb, ret);

diff --git a/fs/aio.c b/fs/aio.c
index 9cdaa2faa5363333627e0cba54a4efe75b45b144..13ca81c7c744ce602cd12b30160684bb74077bbb 100644 (file)
--- a/fs/aio.c
+++ b/fs/aio.c
@@ -1605,7 +1605,7 @@ static int aio_read(struct kiocb *req, const struct iocb *iocb,
                return ret;
        ret = rw_verify_area(READ, file, &req->ki_pos, iov_iter_count(&iter));
        if (!ret)
-               aio_rw_done(req, call_read_iter(file, req, &iter));
+               aio_rw_done(req, file->f_op->read_iter(req, &iter));
        kfree(iovec);
        return ret;
 }
@@ -1636,7 +1636,7 @@ static int aio_write(struct kiocb *req, const struct iocb *iocb,
                if (S_ISREG(file_inode(file)->i_mode))
                        kiocb_start_write(req);
                req->ki_flags |= IOCB_WRITE;
-               aio_rw_done(req, call_write_iter(file, req, &iter));
+               aio_rw_done(req, file->f_op->write_iter(req, &iter));
        }
        kfree(iovec);
        return ret;

diff --git a/fs/read_write.c b/fs/read_write.c
index d4c036e82b6c38cf706e463363d16d78e4dd3fdf..2de7f6adb33d31f0fd36e5f6c62508915c9ffebf 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -392,7 +392,7 @@ static ssize_t new_sync_read(struct file *filp, char __user *buf, size_t len, lo
        kiocb.ki_pos = (ppos ? *ppos : 0);
        iov_iter_ubuf(&iter, ITER_DEST, buf, len);
 
-       ret = call_read_iter(filp, &kiocb, &iter);
+       ret = filp->f_op->read_iter(&kiocb, &iter);
        BUG_ON(ret == -EIOCBQUEUED);
        if (ppos)
                *ppos = kiocb.ki_pos;
@@ -494,7 +494,7 @@ static ssize_t new_sync_write(struct file *filp, const char __user *buf, size_t
        kiocb.ki_pos = (ppos ? *ppos : 0);
        iov_iter_ubuf(&iter, ITER_SOURCE, (void __user *)buf, len);
 
-       ret = call_write_iter(filp, &kiocb, &iter);
+       ret = filp->f_op->write_iter(&kiocb, &iter);
        BUG_ON(ret == -EIOCBQUEUED);
        if (ret > 0 && ppos)
                *ppos = kiocb.ki_pos;
@@ -736,9 +736,9 @@ static ssize_t do_iter_readv_writev(struct file *filp, struct iov_iter *iter,
        kiocb.ki_pos = (ppos ? *ppos : 0);
 
        if (type == READ)
-               ret = call_read_iter(filp, &kiocb, iter);
+               ret = filp->f_op->read_iter(&kiocb, iter);
        else
-               ret = call_write_iter(filp, &kiocb, iter);
+               ret = filp->f_op->write_iter(&kiocb, iter);
        BUG_ON(ret == -EIOCBQUEUED);
        if (ppos)
                *ppos = kiocb.ki_pos;
@@ -799,7 +799,7 @@ ssize_t vfs_iocb_iter_read(struct file *file, struct kiocb *iocb,
        if (ret < 0)
                return ret;
 
-       ret = call_read_iter(file, iocb, iter);
+       ret = file->f_op->read_iter(iocb, iter);
 out:
        if (ret >= 0)
                fsnotify_access(file);
@@ -860,7 +860,7 @@ ssize_t vfs_iocb_iter_write(struct file *file, struct kiocb *iocb,
                return ret;
 
        kiocb_start_write(iocb);
-       ret = call_write_iter(file, iocb, iter);
+       ret = file->f_op->write_iter(iocb, iter);
        if (ret != -EIOCBQUEUED)
                kiocb_end_write(iocb);
        if (ret > 0)

diff --git a/fs/splice.c b/fs/splice.c
index 218e24b1ac40173bbae9e3892e39ab15e076295c..60aed8de21f858554aa4f9786c39063941437606 100644 (file)
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -362,7 +362,7 @@ ssize_t copy_splice_read(struct file *in, loff_t *ppos,
        iov_iter_bvec(&to, ITER_DEST, bv, npages, len);
        init_sync_kiocb(&kiocb, in);
        kiocb.ki_pos = *ppos;
-       ret = call_read_iter(in, &kiocb, &to);
+       ret = in->f_op->read_iter(&kiocb, &to);
 
        if (ret > 0) {
                keep = DIV_ROUND_UP(ret, PAGE_SIZE);
@@ -740,7 +740,7 @@ iter_file_splice_write(struct pipe_inode_info *pipe, struct file *out,
                iov_iter_bvec(&from, ITER_SOURCE, array, n, sd.total_len - left);
                init_sync_kiocb(&kiocb, out);
                kiocb.ki_pos = sd.pos;
-               ret = call_write_iter(out, &kiocb, &from);
+               ret = out->f_op->write_iter(&kiocb, &from);
                sd.pos = kiocb.ki_pos;
                if (ret <= 0)
                        break;

diff --git a/include/linux/fs.h b/include/linux/fs.h
index 143e967a3af26d23d787169e76f59d1521f7c22b..a94343f567cb90aa0a3acdd1dcd63c2c980c6bec 100644 (file)
--- a/include/linux/fs.h
+++ b/include/linux/fs.h
@@ -2096,18 +2096,6 @@ struct inode_operations {
        struct offset_ctx *(*get_offset_ctx)(struct inode *inode);
 } ____cacheline_aligned;
 
-static inline ssize_t call_read_iter(struct file *file, struct kiocb *kio,
-                                    struct iov_iter *iter)
-{
-       return file->f_op->read_iter(kio, iter);
-}
-
-static inline ssize_t call_write_iter(struct file *file, struct kiocb *kio,
-                                     struct iov_iter *iter)
-{
-       return file->f_op->write_iter(kio, iter);
-}
-
 static inline int call_mmap(struct file *file, struct vm_area_struct *vma)
 {
        return file->f_op->mmap(file, vma);

diff --git a/io_uring/rw.c b/io_uring/rw.c
index 0585ebcc9773d3349b007e6ff436c0320e26356d..7d335b7e00ed389b6bd24eab1d66e99aa4a2150b 100644 (file)
--- a/io_uring/rw.c
+++ b/io_uring/rw.c
@@ -701,7 +701,7 @@ static inline int io_iter_do_read(struct io_rw *rw, struct iov_iter *iter)
        struct file *file = rw->kiocb.ki_filp;
 
        if (likely(file->f_op->read_iter))
-               return call_read_iter(file, &rw->kiocb, iter);
+               return file->f_op->read_iter(&rw->kiocb, iter);
        else if (file->f_op->read)
                return loop_rw_iter(READ, rw, iter);
        else
@@ -1047,7 +1047,7 @@ int io_write(struct io_kiocb *req, unsigned int issue_flags)
        kiocb->ki_flags |= IOCB_WRITE;
 
        if (likely(req->file->f_op->write_iter))
-               ret2 = call_write_iter(req->file, kiocb, &s->iter);
+               ret2 = req->file->f_op->write_iter(kiocb, &s->iter);
        else if (req->file->f_op->write)
                ret2 = loop_rw_iter(WRITE, rw, &s->iter);
        else