Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux...

[pandora-kernel.git] / fs / ext3 / fsync.c

diff --git a/fs/ext3/fsync.c b/fs/ext3/fsync.c
index 06a4394..d494c55 100644 (file)
--- a/fs/ext3/fsync.c
+++ b/fs/ext3/fsync.c
@@ -44,7 +44,7 @@
  * inode to disk.
  */
 
-int ext3_sync_file(struct file *file, int datasync)
+int ext3_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 {
        struct inode *inode = file->f_mapping->host;
        struct ext3_inode_info *ei = EXT3_I(inode);
@@ -52,13 +52,23 @@ int ext3_sync_file(struct file *file, int datasync)
        int ret, needs_barrier = 0;
        tid_t commit_tid;
 
-       J_ASSERT(ext3_journal_current_handle() == NULL);
-
        trace_ext3_sync_file_enter(file, datasync);
 
        if (inode->i_sb->s_flags & MS_RDONLY)
                return 0;
 
+       ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
+       if (ret)
+               goto out;
+
+       /*
+        * Taking the mutex here just to keep consistent with how fsync was
+        * called previously, however it looks like we don't need to take
+        * i_mutex at all.
+        */
+       mutex_lock(&inode->i_mutex);
+
+       J_ASSERT(ext3_journal_current_handle() == NULL);
 
        /*
         * data=writeback,ordered:
@@ -75,6 +85,7 @@ int ext3_sync_file(struct file *file, int datasync)
         *  safe in-journal, which is all fsync() needs to ensure.
         */
        if (ext3_should_journal_data(inode)) {
+               mutex_unlock(&inode->i_mutex);
                ret = ext3_force_commit(inode->i_sb);
                goto out;
        }
@@ -98,6 +109,7 @@ int ext3_sync_file(struct file *file, int datasync)
        if (needs_barrier)
                blkdev_issue_flush(inode->i_sb->s_bdev, GFP_KERNEL, NULL);
 
+       mutex_unlock(&inode->i_mutex);
 out:
        trace_ext3_sync_file_exit(inode, ret);
        return ret;