Merge tag 'for-5.20/io_uring-buffered-writes-2022-07-29' of git://git.kernel.dk/linux...

[sfrench/cifs-2.6.git] / fs / read_write.c

diff --git a/fs/read_write.c b/fs/read_write.c
index 397da0236607ee10c90b4b2a02d9183813d203f9..0131d0df0476bf589be41a9aef5a70c9acd4f1e6 100644 (file)
--- a/fs/read_write.c
+++ b/fs/read_write.c
@@ -1663,7 +1663,9 @@ int generic_write_checks_count(struct kiocb *iocb, loff_t *count)
        if (iocb->ki_flags & IOCB_APPEND)
                iocb->ki_pos = i_size_read(inode);
 
-       if ((iocb->ki_flags & IOCB_NOWAIT) && !(iocb->ki_flags & IOCB_DIRECT))
+       if ((iocb->ki_flags & IOCB_NOWAIT) &&
+           !((iocb->ki_flags & IOCB_DIRECT) ||
+             (file->f_mode & FMODE_BUF_WASYNC)))
                return -EINVAL;
 
        return generic_write_check_limits(iocb->ki_filp, iocb->ki_pos, count);