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

Commit a1b66abe authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Greg Kroah-Hartman
Browse files

xfs: fix IOCB_NOWAIT handling in xfs_file_dio_aio_read 



commit 7b53b868a1812a9a6ab5e69249394bd37f29ce2c upstream.

Direct I/O reads can also be used with RWF_NOWAIT & co.  Fix the inode
locking in xfs_file_dio_aio_read to take IOCB_NOWAIT into account.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarCarlos Maiolino <cmaiolino@redhat.com>
Reviewed-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: default avatarDarrick J. Wong <darrick.wong@oracle.com>
Acked-by: default avatarDarrick J. Wong <djwong@kernel.org>
Signed-off-by: default avatarChandan Babu R <chandan.babu@oracle.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 1e4a0723

fs/xfs/xfs_file.c

+6 −1
Original line number Diff line number Diff line
@@ -187,7 +187,12 @@ xfs_file_dio_aio_read( 


	file_accessed(iocb->ki_filp);



	if (iocb->ki_flags & IOCB_NOWAIT) {

		if (!xfs_ilock_nowait(ip, XFS_IOLOCK_SHARED))

			return -EAGAIN;

	} else {

		xfs_ilock(ip, XFS_IOLOCK_SHARED);

	}

	ret = iomap_dio_rw(iocb, to, &xfs_iomap_ops, NULL);

	xfs_iunlock(ip, XFS_IOLOCK_SHARED);