1 files changed, 35 insertions, 3 deletions

diff --git a/fs/ext4/fsync.c b/fs/ext4/fsync.c
index ce66d2fe826c..da3bed3e0c29 100644
--- a/fs/ext4/fsync.c
+++ b/fs/ext4/fsync.c
@@ -151,6 +151,32 @@ static int ext4_sync_parent(struct inode *inode)
         return ret;
 }
 
+/**
+ * __sync_file - generic_file_fsync without the locking and filemap_write
+ * @inode:      inode to sync
+ * @datasync:   only sync essential metadata if true
+ *
+ * This is just generic_file_fsync without the locking.  This is needed for
+ * nojournal mode to make sure this inodes data/metadata makes it to disk
+ * properly.  The i_mutex should be held already.
+ */
+static int __sync_inode(struct inode *inode, int datasync)
+{
+        int err;
+        int ret;
+
+        ret = sync_mapping_buffers(inode->i_mapping);
+        if (!(inode->i_state & I_DIRTY))
+                return ret;
+        if (datasync && !(inode->i_state & I_DIRTY_DATASYNC))
+                return ret;
+
+        err = sync_inode_metadata(inode, 1);
+        if (ret == 0)
+                ret = err;
+        return ret;
+}
+
 /*
  * akpm: A new design for ext4_sync_file().
  *
@@ -165,7 +191,7 @@ static int ext4_sync_parent(struct inode *inode)
  * i_mutex lock is held when entering and exiting this function
  */
 
-int ext4_sync_file(struct file *file, int datasync)
+int ext4_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 {
         struct inode *inode = file->f_mapping->host;
         struct ext4_inode_info *ei = EXT4_I(inode);
@@ -178,15 +204,20 @@ int ext4_sync_file(struct file *file, int datasync)
 
         trace_ext4_sync_file_enter(file, datasync);
 
+        ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+        if (ret)
+                return ret;
+        mutex_lock(&inode->i_mutex);
+
         if (inode->i_sb->s_flags & MS_RDONLY)
-                return 0;
+                goto out;
 
         ret = ext4_flush_completed_IO(inode);
         if (ret < 0)
                 goto out;
 
         if (!journal) {
-                ret = generic_file_fsync(file, datasync);
+                ret = __sync_inode(inode, datasync);
                 if (!ret && !list_empty(&inode->i_dentry))
                         ret = ext4_sync_parent(inode);
                 goto out;
@@ -220,6 +251,7 @@ int ext4_sync_file(struct file *file, int datasync)
         if (needs_barrier)
                 blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
  out:
+        mutex_unlock(&inode->i_mutex);
         trace_ext4_sync_file_exit(inode, ret);
         return ret;
 }