Commit a6cbcd4a authored by Al Viro's avatar Al Viro
Browse files

get rid of pointless iov_length() in ->direct_IO() 



all callers have iov_length(iter->iov, iter->nr_segs) == iov_iter_count(iter)

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 16b1f05d

drivers/staging/lustre/lustre/llite/rw26.c

+1 −1
Original line number Diff line number Diff line
@@ -370,7 +370,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb, 
	struct file *file = iocb->ki_filp;

	struct inode *inode = file->f_mapping->host;

	struct ccc_object *obj = cl_inode2ccc(inode);

	long count = iov_length(iter->iov, iter->nr_segs);

	long count = iov_iter_count(iter);

	long tot_bytes = 0, result = 0;

	struct ll_inode_info *lli = ll_i2info(inode);

	unsigned long seg = 0;

fs/btrfs/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -7456,7 +7456,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, 
	 * we need to flush the dirty pages again to make absolutely sure

	 * that any outstanding dirty pages are on disk.

	 */

	count = iov_length(iter->iov, iter->nr_segs);

	count = iov_iter_count(iter);

	if (test_bit(BTRFS_INODE_HAS_ASYNC_EXTENT,

		     &BTRFS_I(inode)->runtime_flags))

		filemap_fdatawrite_range(inode->i_mapping, offset, count);

fs/ext2/inode.c

+2 −2
Original line number Diff line number Diff line
@@ -856,13 +856,13 @@ ext2_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, 
	struct file *file = iocb->ki_filp;

	struct address_space *mapping = file->f_mapping;

	struct inode *inode = mapping->host;

	size_t count = iov_iter_count(iter);

	ssize_t ret;



	ret = blockdev_direct_IO(rw, iocb, inode, iter->iov, offset,

				 iter->nr_segs, ext2_get_block);

	if (ret < 0 && (rw & WRITE))

		ext2_write_failed(mapping, offset +

				  iov_length(iter->iov, iter->nr_segs));

		ext2_write_failed(mapping, offset + count);

	return ret;

}

fs/ext3/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -1828,7 +1828,7 @@ static ssize_t ext3_direct_IO(int rw, struct kiocb *iocb, 
	handle_t *handle;

	ssize_t ret;

	int orphan = 0;

	size_t count = iov_length(iter->iov, iter->nr_segs);

	size_t count = iov_iter_count(iter);

	int retries = 0;



	trace_ext3_direct_IO_enter(inode, offset, count, rw);

fs/ext4/indirect.c

+1 −1
Original line number Diff line number Diff line
@@ -647,7 +647,7 @@ ssize_t ext4_ind_direct_IO(int rw, struct kiocb *iocb, 
	handle_t *handle;

	ssize_t ret;

	int orphan = 0;

	size_t count = iov_length(iter->iov, iter->nr_segs);

	size_t count = iov_iter_count(iter);

	int retries = 0;



	if (rw == WRITE) {