Merge tag 'pull-work.iov_iter-base' of git://git.kernel.org/pub/scm/linux/kernel...

[platform/kernel/linux-starfive.git] / fs / btrfs / file.c

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 9dfde1a..30e6aef 100644 (file)
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1848,7 +1848,6 @@ static ssize_t check_direct_IO(struct btrfs_fs_info *fs_info,
 
 static ssize_t btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
 {
-       const bool is_sync_write = (iocb->ki_flags & IOCB_DSYNC);
        struct file *file = iocb->ki_filp;
        struct inode *inode = file_inode(file);
        struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb);
@@ -1902,15 +1901,6 @@ relock:
        }
 
        /*
-        * We remove IOCB_DSYNC so that we don't deadlock when iomap_dio_rw()
-        * calls generic_write_sync() (through iomap_dio_complete()), because
-        * that results in calling fsync (btrfs_sync_file()) which will try to
-        * lock the inode in exclusive/write mode.
-        */
-       if (is_sync_write)
-               iocb->ki_flags &= ~IOCB_DSYNC;
-
-       /*
         * The iov_iter can be mapped to the same file range we are writing to.
         * If that's the case, then we will deadlock in the iomap code, because
         * it first calls our callback btrfs_dio_iomap_begin(), which will create
@@ -1964,13 +1954,6 @@ again:
 
        btrfs_inode_unlock(inode, ilock_flags);
 
-       /*
-        * Add back IOCB_DSYNC. Our caller, btrfs_file_write_iter(), will do
-        * the fsync (call generic_write_sync()).
-        */
-       if (is_sync_write)
-               iocb->ki_flags |= IOCB_DSYNC;
-
        /* If 'err' is -ENOTBLK then it means we must fallback to buffered IO. */
        if ((err < 0 && err != -ENOTBLK) || !iov_iter_count(from))
                goto out;
@@ -2038,7 +2021,7 @@ ssize_t btrfs_do_write_iter(struct kiocb *iocb, struct iov_iter *from,
        struct file *file = iocb->ki_filp;
        struct btrfs_inode *inode = BTRFS_I(file_inode(file));
        ssize_t num_written, num_sync;
-       const bool sync = iocb->ki_flags & IOCB_DSYNC;
+       const bool sync = iocb_is_dsync(iocb);
 
        /*
         * If the fs flips readonly due to some impossible error, although we