1 files changed, 6 insertions, 10 deletions

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 8d7b5a45c005..ea9f10bb089c 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1703,18 +1703,17 @@ again:
         return num_written ? num_written : ret;
 }
 
-static ssize_t __btrfs_direct_write(struct kiocb *iocb,
-                                    struct iov_iter *from,
-                                    loff_t pos)
+static ssize_t __btrfs_direct_write(struct kiocb *iocb, struct iov_iter *from)
 {
         struct file *file = iocb->ki_filp;
         struct inode *inode = file_inode(file);
+        loff_t pos = iocb->ki_pos;
         ssize_t written;
         ssize_t written_buffered;
         loff_t endbyte;
         int err;
 
-        written = generic_file_direct_write(iocb, from, pos);
+        written = generic_file_direct_write(iocb, from);
 
         if (written < 0 || !iov_iter_count(from))
                 return written;
@@ -1832,7 +1831,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
                 atomic_inc(&BTRFS_I(inode)->sync_writers);
 
         if (iocb->ki_flags & IOCB_DIRECT) {
-                num_written = __btrfs_direct_write(iocb, from, pos);
+                num_written = __btrfs_direct_write(iocb, from);
         } else {
                 num_written = __btrfs_buffered_write(file, from, pos);
                 if (num_written > 0)
@@ -1852,11 +1851,8 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
         spin_lock(&BTRFS_I(inode)->lock);
         BTRFS_I(inode)->last_sub_trans = root->log_transid;
         spin_unlock(&BTRFS_I(inode)->lock);
-        if (num_written > 0) {
-                err = generic_write_sync(file, pos, num_written);
-                if (err < 0)
-                        num_written = err;
-        }
+        if (num_written > 0)
+                num_written = generic_write_sync(iocb, num_written);
 
         if (sync)
                 atomic_dec(&BTRFS_I(inode)->sync_writers);