lkml.org 
[lkml]   [2020]   [Jan]   [14]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 03/12] xfs: fix IOCB_NOWAIT handling in xfs_file_dio_aio_read
    Date
    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: Christoph Hellwig <hch@lst.de>
    ---
    fs/xfs/xfs_file.c | 7 ++++++-
    1 file changed, 6 insertions(+), 1 deletion(-)

    diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
    index c93250108952..b8a4a3f29b36 100644
    --- a/fs/xfs/xfs_file.c
    +++ b/fs/xfs/xfs_file.c
    @@ -187,7 +187,12 @@ xfs_file_dio_aio_read(

    file_accessed(iocb->ki_filp);

    - xfs_ilock(ip, XFS_IOLOCK_SHARED);
    + 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_read_iomap_ops, NULL,
    is_sync_kiocb(iocb));
    xfs_iunlock(ip, XFS_IOLOCK_SHARED);
    --
    2.24.1
    \
     
     \ /
      Last update: 2020-01-14 17:13    [W:2.329 / U:0.020 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site