Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f673763 authored by Omar Sandoval's avatar Omar Sandoval Committed by Al Viro
Browse files

direct_IO: use iov_iter_rw() instead of rw everywhere 



The rw parameter to direct_IO is redundant with iov_iter->type, and
treated slightly differently just about everywhere it's used: some users
do rw & WRITE, and others do rw == WRITE where they should be doing a
bitwise check. Simplify this with the new iov_iter_rw() helper, which
always returns either READ or WRITE.

Signed-off-by: default avatarOmar Sandoval <osandov@osandov.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent a95cd631

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

+9 −9
Original line number Diff line number Diff line
@@ -399,7 +399,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb, 
	 *    size changing by concurrent truncates and writes.

	 * 1. Need inode mutex to operate transient pages.

	 */

	if (rw == READ)

	if (iov_iter_rw(iter) == READ)

		mutex_lock(&inode->i_mutex);



	LASSERT(obj->cob_transient_pages == 0);
@@ -408,7 +408,7 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb, 
		size_t offs;



		count = min_t(size_t, iov_iter_count(iter), size);

		if (rw == READ) {

		if (iov_iter_rw(iter) == READ) {

			if (file_offset >= i_size_read(inode))

				break;

			if (file_offset + count > i_size_read(inode))
@@ -418,11 +418,11 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb, 
		result = iov_iter_get_pages_alloc(iter, &pages, count, &offs);

		if (likely(result > 0)) {

			int n = DIV_ROUND_UP(result + offs, PAGE_SIZE);

			result = ll_direct_IO_26_seg(env, io, rw, inode,

						     file->f_mapping,

						     result, file_offset,

						     pages, n);

			ll_free_user_pages(pages, n, rw==READ);

			result = ll_direct_IO_26_seg(env, io, iov_iter_rw(iter),

						     inode, file->f_mapping,

						     result, file_offset, pages,

						     n);

			ll_free_user_pages(pages, n, iov_iter_rw(iter) == READ);

		}

		if (unlikely(result <= 0)) {

			/* If we can't allocate a large enough buffer
@@ -449,11 +449,11 @@ static ssize_t ll_direct_IO_26(int rw, struct kiocb *iocb, 
	}

out:

	LASSERT(obj->cob_transient_pages == 0);

	if (rw == READ)

	if (iov_iter_rw(iter) == READ)

		mutex_unlock(&inode->i_mutex);



	if (tot_bytes > 0) {

		if (rw == WRITE) {

		if (iov_iter_rw(iter) == WRITE) {

			struct lov_stripe_md *lsm;



			lsm = ccc_inode_lsm_get(inode);

fs/9p/vfs_addr.c

+1 −1
Original line number Diff line number Diff line
@@ -253,7 +253,7 @@ v9fs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, loff_t pos) 
	struct file *file = iocb->ki_filp;

	ssize_t n;

	int err = 0;

	if (rw & WRITE) {

	if (iov_iter_rw(iter) == WRITE) {

		n = p9_client_write(file->private_data, pos, iter, &err);

		if (n) {

			struct inode *inode = file_inode(file);

fs/affs/file.c

+2 −2
Original line number Diff line number Diff line
@@ -398,7 +398,7 @@ affs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, 
	size_t count = iov_iter_count(iter);

	ssize_t ret;



	if (rw == WRITE) {

	if (iov_iter_rw(iter) == WRITE) {

		loff_t size = offset + count;



		if (AFFS_I(inode)->mmu_private < size)
@@ -406,7 +406,7 @@ affs_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, 
	}



	ret = blockdev_direct_IO(iocb, inode, iter, offset, affs_get_block);

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

	if (ret < 0 && iov_iter_rw(iter) == WRITE)

		affs_write_failed(mapping, offset + count);

	return ret;

}

fs/btrfs/inode.c

+5 −5
Original line number Diff line number Diff line
@@ -8081,7 +8081,7 @@ static void btrfs_submit_direct(int rw, struct bio *dio_bio, 
	bio_endio(dio_bio, ret);

}



static ssize_t check_direct_IO(struct btrfs_root *root, int rw, struct kiocb *iocb,

static ssize_t check_direct_IO(struct btrfs_root *root, struct kiocb *iocb,

			const struct iov_iter *iter, loff_t offset)

{

	int seg;
@@ -8096,7 +8096,7 @@ static ssize_t check_direct_IO(struct btrfs_root *root, int rw, struct kiocb *io 
		goto out;



	/* If this is a write we don't need to check anymore */

	if (rw & WRITE)

	if (iov_iter_rw(iter) == WRITE)

		return 0;

	/*

	 * Check to make sure we don't have duplicate iov_base's in this
@@ -8126,7 +8126,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, 
	bool relock = false;

	ssize_t ret;



	if (check_direct_IO(BTRFS_I(inode)->root, rw, iocb, iter, offset))

	if (check_direct_IO(BTRFS_I(inode)->root, iocb, iter, offset))

		return 0;



	atomic_inc(&inode->i_dio_count);
@@ -8144,7 +8144,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, 
		filemap_fdatawrite_range(inode->i_mapping, offset,

					 offset + count - 1);



	if (rw & WRITE) {

	if (iov_iter_rw(iter) == WRITE) {

		/*

		 * If the write DIO is beyond the EOF, we need update

		 * the isize, but it is protected by i_mutex. So we can
@@ -8178,7 +8178,7 @@ static ssize_t btrfs_direct_IO(int rw, struct kiocb *iocb, 
				   BTRFS_I(inode)->root->fs_info->fs_devices->latest_bdev,

				   iter, offset, btrfs_get_blocks_direct, NULL,

				   btrfs_submit_direct, flags);

	if (rw & WRITE) {

	if (iov_iter_rw(iter) == WRITE) {

		current->journal_info = NULL;

		if (ret < 0 && ret != -EIOCBQUEUED)

			btrfs_delalloc_release_space(inode, count);

fs/ext2/inode.c

+1 −1
Original line number Diff line number Diff line
@@ -866,7 +866,7 @@ ext2_direct_IO(int rw, struct kiocb *iocb, struct iov_iter *iter, 
	else

		ret = blockdev_direct_IO(iocb, inode, iter, offset,

					 ext2_get_block);

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

	if (ret < 0 && iov_iter_rw(iter) == WRITE)

		ext2_write_failed(mapping, offset + count);

	return ret;

}