Commit 2f632965 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

iomap: pass a flags argument to iomap_dio_rw 



Pass a set of flags to iomap_dio_rw instead of the boolean
wait_for_completion argument.  The IOMAP_DIO_FORCE_WAIT flag
replaces the wait_for_completion, but only needs to be passed
when the iocb isn't synchronous to start with to simplify the
callers.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarDave Chinner <dchinner@redhat.com>
Reviewed-by: default avatarBrian Foster <bfoster@redhat.com>
[djwong: rework xfs_file.c so that we can push iomap changes separately]
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent 5724be5d

fs/btrfs/file.c

+3 −4
Original line number Diff line number Diff line
@@ -1949,8 +1949,8 @@ static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from) 
		goto buffered;

	}



	dio = __iomap_dio_rw(iocb, from, &btrfs_dio_iomap_ops,

			     &btrfs_dio_ops, is_sync_kiocb(iocb));

	dio = __iomap_dio_rw(iocb, from, &btrfs_dio_iomap_ops, &btrfs_dio_ops,

			     0);



	btrfs_inode_unlock(inode, ilock_flags);
@@ -3622,8 +3622,7 @@ static ssize_t btrfs_direct_read(struct kiocb *iocb, struct iov_iter *to) 
		return 0;



	btrfs_inode_lock(inode, BTRFS_ILOCK_SHARED);

	ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, &btrfs_dio_ops,

			   is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, to, &btrfs_dio_iomap_ops, &btrfs_dio_ops, 0);

	btrfs_inode_unlock(inode, BTRFS_ILOCK_SHARED);

	return ret;

}

fs/ext4/file.c

+2 −3
Original line number Diff line number Diff line
@@ -74,8 +74,7 @@ static ssize_t ext4_dio_read_iter(struct kiocb *iocb, struct iov_iter *to) 
		return generic_file_read_iter(iocb, to);

	}



	ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL,

			   is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, to, &ext4_iomap_ops, NULL, 0);

	inode_unlock_shared(inode);



	file_accessed(iocb->ki_filp);
@@ -550,7 +549,7 @@ static ssize_t ext4_dio_write_iter(struct kiocb *iocb, struct iov_iter *from) 
	if (ilock_shared)

		iomap_ops = &ext4_iomap_overwrite_ops;

	ret = iomap_dio_rw(iocb, from, iomap_ops, &ext4_dio_write_ops,

			   is_sync_kiocb(iocb) || unaligned_io || extend);

			   (unaligned_io || extend) ? IOMAP_DIO_FORCE_WAIT : 0);

	if (ret == -ENOTBLK)

		ret = 0;

fs/gfs2/file.c

+2 −5
Original line number Diff line number Diff line
@@ -797,9 +797,7 @@ static ssize_t gfs2_file_direct_read(struct kiocb *iocb, struct iov_iter *to, 
	if (ret)

		goto out_uninit;



	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));



	ret = iomap_dio_rw(iocb, to, &gfs2_iomap_ops, NULL, 0);

	gfs2_glock_dq(gh);

out_uninit:

	gfs2_holder_uninit(gh);
@@ -833,8 +831,7 @@ static ssize_t gfs2_file_direct_write(struct kiocb *iocb, struct iov_iter *from, 
	if (offset + len > i_size_read(&ip->i_inode))

		goto out;



	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL,

			   is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, from, &gfs2_iomap_ops, NULL, 0);

	if (ret == -ENOTBLK)

		ret = 0;

out:

fs/iomap/direct-io.c

+5 −6
Original line number Diff line number Diff line
@@ -420,13 +420,15 @@ iomap_dio_actor(struct inode *inode, loff_t pos, loff_t length, 
struct iomap_dio *

__iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,

		const struct iomap_ops *ops, const struct iomap_dio_ops *dops,

		bool wait_for_completion)

		unsigned int dio_flags)

{

	struct address_space *mapping = iocb->ki_filp->f_mapping;

	struct inode *inode = file_inode(iocb->ki_filp);

	size_t count = iov_iter_count(iter);

	loff_t pos = iocb->ki_pos;

	loff_t end = iocb->ki_pos + count - 1, ret = 0;

	bool wait_for_completion =

		is_sync_kiocb(iocb) || (dio_flags & IOMAP_DIO_FORCE_WAIT);

	unsigned int iomap_flags = IOMAP_DIRECT;

	struct blk_plug plug;

	struct iomap_dio *dio;
@@ -434,9 +436,6 @@ __iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter, 
	if (!count)

		return NULL;



	if (WARN_ON(is_sync_kiocb(iocb) && !wait_for_completion))

		return ERR_PTR(-EIO);



	dio = kmalloc(sizeof(*dio), GFP_KERNEL);

	if (!dio)

		return ERR_PTR(-ENOMEM);
@@ -598,11 +597,11 @@ EXPORT_SYMBOL_GPL(__iomap_dio_rw); 
ssize_t

iomap_dio_rw(struct kiocb *iocb, struct iov_iter *iter,

		const struct iomap_ops *ops, const struct iomap_dio_ops *dops,

		bool wait_for_completion)

		unsigned int dio_flags)

{

	struct iomap_dio *dio;



	dio = __iomap_dio_rw(iocb, iter, ops, dops, wait_for_completion);

	dio = __iomap_dio_rw(iocb, iter, ops, dops, dio_flags);

	if (IS_ERR_OR_NULL(dio))

		return PTR_ERR_OR_ZERO(dio);

	return iomap_dio_complete(dio);

fs/xfs/xfs_file.c

+2 −3
Original line number Diff line number Diff line
@@ -219,8 +219,7 @@ xfs_file_dio_aio_read( 
	} else {

		xfs_ilock(ip, XFS_IOLOCK_SHARED);

	}

	ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops, NULL,

			is_sync_kiocb(iocb));

	ret = iomap_dio_rw(iocb, to, &xfs_read_iomap_ops, NULL, 0);

	xfs_iunlock(ip, XFS_IOLOCK_SHARED);



	return ret;
@@ -584,7 +583,7 @@ xfs_file_dio_aio_write( 
	 */

	ret = iomap_dio_rw(iocb, from, &xfs_direct_write_iomap_ops,

			   &xfs_dio_write_ops,

			   is_sync_kiocb(iocb) || unaligned_io);

			   unaligned_io ? IOMAP_DIO_FORCE_WAIT : 0);

out:

	xfs_iunlock(ip, iolock);