Commit 354be7e3 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Darrick J. Wong
Browse files

xfs: make xfs_file_aio_write_checks IOCB_NOWAIT-aware 



Ensure we don't block on the iolock, or waiting for I/O in
xfs_file_aio_write_checks if the caller asked to avoid that.

Fixes: 29a5d29e ("xfs: nowait aio support")
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>
Reviewed-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarDarrick J. Wong <djwong@kernel.org>
parent f50b8f47

fs/xfs/xfs_file.c

+21 −4
Original line number Diff line number Diff line
@@ -334,7 +334,14 @@ xfs_file_aio_write_checks( 
	if (error <= 0)

		return error;



	if (iocb->ki_flags & IOCB_NOWAIT) {

		error = break_layout(inode, false);

		if (error == -EWOULDBLOCK)

			error = -EAGAIN;

	} else {

		error = xfs_break_layouts(inode, iolock, BREAK_WRITE);

	}



	if (error)

		return error;
@@ -345,7 +352,11 @@ xfs_file_aio_write_checks( 
	if (*iolock == XFS_IOLOCK_SHARED && !IS_NOSEC(inode)) {

		xfs_iunlock(ip, *iolock);

		*iolock = XFS_IOLOCK_EXCL;

		xfs_ilock(ip, *iolock);

		error = xfs_ilock_iocb(iocb, *iolock);

		if (error) {

			*iolock = 0;

			return error;

		}

		goto restart;

	}

	/*
@@ -367,6 +378,10 @@ xfs_file_aio_write_checks( 
	isize = i_size_read(inode);

	if (iocb->ki_pos > isize) {

		spin_unlock(&ip->i_flags_lock);



		if (iocb->ki_flags & IOCB_NOWAIT)

			return -EAGAIN;



		if (!drained_dio) {

			if (*iolock == XFS_IOLOCK_SHARED) {

				xfs_iunlock(ip, *iolock);
@@ -592,6 +607,7 @@ xfs_file_dio_aio_write( 
			   &xfs_dio_write_ops,

			   unaligned_io ? IOMAP_DIO_FORCE_WAIT : 0);

out:

	if (iolock)

		xfs_iunlock(ip, iolock);



	/*
@@ -631,6 +647,7 @@ xfs_file_dax_write( 
		error = xfs_setfilesize(ip, pos, ret);

	}

out:

	if (iolock)

		xfs_iunlock(ip, iolock);

	if (error)

		return error;