Commit 7c98f7cb authored by Miklos Szeredi's avatar Miklos Szeredi Committed by Al Viro
Browse files

remove call_{read,write}_iter() functions 



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

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

Fixes: bb7462b6 ("vfs: use helpers for calling f_op->{read,write}_iter()")
Reviewed-by: default avatarChristian Brauner <brauner@kernel.org>
Signed-off-by: default avatarMiklos Szeredi <mszeredi@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 0f4a2ceb

drivers/block/loop.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

drivers/target/target_core_file.c

+2 −2
Original line number Diff line number Diff line
@@ -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);

fs/aio.c

+2 −2
Original line number Diff line number Diff line
@@ -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;

fs/read_write.c

+6 −6
Original line number Diff line number Diff line
@@ -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)

fs/splice.c

+2 −2
Original line number Diff line number Diff line
@@ -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;