1 files changed, 5 insertions, 1 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 9e75d8a39aac..e62dd55b4079 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1886,6 +1886,10 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
         loff_t oldsize;
         int clean_page = 0;
 
+        if (!(iocb->ki_flags & IOCB_DIRECT) &&
+            (iocb->ki_flags & IOCB_NOWAIT))
+                return -EOPNOTSUPP;
+
         if (!inode_trylock(inode)) {
                 if (iocb->ki_flags & IOCB_NOWAIT)
                         return -EAGAIN;
@@ -3105,7 +3109,7 @@ out:
 
 static int btrfs_file_open(struct inode *inode, struct file *filp)
 {
-        filp->f_mode |= FMODE_AIO_NOWAIT;
+        filp->f_mode |= FMODE_NOWAIT;
         return generic_file_open(inode, filp);
 }