11 files changed, 14 insertions, 11 deletions

diff --git a/fs/block_dev.c b/fs/block_dev.c
index 9e1f3fe25753..d8dc3512e927 100644
--- a/fs/block_dev.c
+++ b/fs/block_dev.c
@@ -1662,7 +1662,7 @@ ssize_t blkdev_write_iter(struct kiocb *iocb, struct iov_iter *from)
         ret = __generic_file_write_iter(iocb, from);
         if (ret > 0) {
                 ssize_t err;
-                err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+                err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                 if (err < 0)
                         ret = err;
         }
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index 6c376311a9d7..35ce146cceec 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1852,7 +1852,7 @@ static ssize_t btrfs_file_write_iter(struct kiocb *iocb,
         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);
+                err = generic_write_sync(iocb, pos, num_written);
                 if (err < 0)
                         num_written = err;
         }
diff --git a/fs/cifs/file.c b/fs/cifs/file.c
index cb070aa88e57..b22b68ccfbe5 100644
--- a/fs/cifs/file.c
+++ b/fs/cifs/file.c
@@ -2688,7 +2688,7 @@ out:
         inode_unlock(inode);
 
         if (rc > 0) {
-                ssize_t err = generic_write_sync(file, iocb->ki_pos - rc, rc);
+                ssize_t err = generic_write_sync(iocb, iocb->ki_pos - rc, rc);
                 if (err < 0)
                         rc = err;
         }
diff --git a/fs/direct-io.c b/fs/direct-io.c
index c61314b84b01..f7bcc0193dee 100644
--- a/fs/direct-io.c
+++ b/fs/direct-io.c
@@ -268,7 +268,7 @@ static ssize_t dio_complete(struct dio *dio, ssize_t ret, bool is_async)
                 if (dio->rw & WRITE) {
                         int err;
 
-                        err = generic_write_sync(dio->iocb->ki_filp, offset,
+                        err = generic_write_sync(dio->iocb, offset,
                                                  transferred);
                         if (err < 0 && ret > 0)
                                 ret = err;
diff --git a/fs/ext4/file.c b/fs/ext4/file.c
index fa2208bae2e1..1417e129be51 100644
--- a/fs/ext4/file.c
+++ b/fs/ext4/file.c
@@ -172,7 +172,7 @@ ext4_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (ret > 0) {
                 ssize_t err;
 
-                err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+                err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                 if (err < 0)
                         ret = err;
         }
diff --git a/fs/f2fs/file.c b/fs/f2fs/file.c
index 443e07705c2a..51ed8388e66c 100644
--- a/fs/f2fs/file.c
+++ b/fs/f2fs/file.c
@@ -1885,7 +1885,7 @@ static ssize_t f2fs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         if (ret > 0) {
                 ssize_t err;
 
-                err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+                err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                 if (err < 0)
                         ret = err;
         }
diff --git a/fs/gfs2/file.c b/fs/gfs2/file.c
index 208efc70ad49..5a7d69609309 100644
--- a/fs/gfs2/file.c
+++ b/fs/gfs2/file.c
@@ -895,7 +895,10 @@ static long __gfs2_fallocate(struct file *file, int mode, loff_t offset, loff_t
                 mark_inode_dirty(inode);
         }
 
-        return generic_write_sync(file, pos, count);
+        if ((file->f_flags & O_DSYNC) || IS_SYNC(file->f_mapping->host))
+                return vfs_fsync_range(file, pos, pos + count - 1,
+                               (file->f_flags & __O_SYNC) ? 0 : 1);
+        return 0;
 
 out_trans_fail:
         gfs2_inplace_release(ip);
diff --git a/fs/nfs/direct.c b/fs/nfs/direct.c
index 346b5d85ce92..be86de9a77d7 100644
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@ -1054,7 +1054,7 @@ ssize_t nfs_file_direct_write(struct kiocb *iocb, struct iov_iter *iter)
                         if (i_size_read(inode) < iocb->ki_pos)
                                 i_size_write(inode, iocb->ki_pos);
                         spin_unlock(&inode->i_lock);
-                        generic_write_sync(file, pos, result);
+                        generic_write_sync(iocb, pos, result);
                 }
         }
         nfs_direct_req_release(dreq);
diff --git a/fs/ntfs/file.c b/fs/ntfs/file.c
index 91117ada8528..10dc38cc02bb 100644
--- a/fs/ntfs/file.c
+++ b/fs/ntfs/file.c
@@ -1953,7 +1953,7 @@ static ssize_t ntfs_file_write_iter(struct kiocb *iocb, struct iov_iter *from)
         current->backing_dev_info = NULL;
         inode_unlock(vi);
         if (likely(written > 0)) {
-                err = generic_write_sync(file, iocb->ki_pos, written);
+                err = generic_write_sync(iocb, iocb->ki_pos, written);
                 if (err < 0)
                         written = 0;
         }
diff --git a/fs/udf/file.c b/fs/udf/file.c
index 7ab8d8196e90..8e3d1ae53b11 100644
--- a/fs/udf/file.c
+++ b/fs/udf/file.c
@@ -152,7 +152,7 @@ out:
 
         if (retval > 0) {
                 mark_inode_dirty(inode);
-                err = generic_write_sync(file, iocb->ki_pos - retval, retval);
+                err = generic_write_sync(iocb, iocb->ki_pos - retval, retval);
                 if (err < 0)
                         retval = err;
         }
diff --git a/fs/xfs/xfs_file.c b/fs/xfs/xfs_file.c
index 5de047ab2411..b5d70e77195d 100644
--- a/fs/xfs/xfs_file.c
+++ b/fs/xfs/xfs_file.c
@@ -908,7 +908,7 @@ xfs_file_write_iter(
                 XFS_STATS_ADD(ip->i_mount, xs_write_bytes, ret);
 
                 /* Handle various SYNC-type writes */
-                err = generic_write_sync(file, iocb->ki_pos - ret, ret);
+                err = generic_write_sync(iocb, iocb->ki_pos - ret, ret);
                 if (err < 0)
                         ret = err;
         }