diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 8aa7fb02f5c13da9aa4d9286166cd5ee6c5500a5..4ffb7fc50d15a6bdfd37a5ff07929b64d69eaf0c 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -3893,7 +3893,13 @@ static ssize_t ext4_direct_IO_read(struct kiocb *iocb, struct iov_iter *iter) * writes & truncates and since we take care of writing back page cache, * we are protected against page writeback as well. */ - inode_lock_shared(inode); + if (iocb->ki_flags & IOCB_NOWAIT) { + if (!inode_trylock_shared(inode)) + return -EAGAIN; + } else { + inode_lock_shared(inode); + } + ret = filemap_write_and_wait_range(mapping, iocb->ki_pos, iocb->ki_pos + count - 1); if (ret)