]> git.karo-electronics.de Git - linux-beck.git/commitdiff
Btrfs: do not do filemap_write_and_wait_range in fsync
authorJosef Bacik <josef@redhat.com>
Mon, 23 Apr 2012 19:09:39 +0000 (15:09 -0400)
committerJosef Bacik <josef@redhat.com>
Wed, 30 May 2012 14:23:29 +0000 (10:23 -0400)
We already do the btrfs_wait_ordered_range which will do this for us, so
just remove this call so we don't call it twice.  Thanks,

Signed-off-by: Josef Bacik <josef@redhat.com>
fs/btrfs/file.c

index 8aa8d7fe74d7c529c7a10a7f2deedbe89ac0e168..cfc0ab915d0329bbac509f7390994019c546dc8c 100644 (file)
@@ -1497,14 +1497,15 @@ int btrfs_sync_file(struct file *file, loff_t start, loff_t end, int datasync)
 
        trace_btrfs_sync_file(file, datasync);
 
-       ret = filemap_write_and_wait_range(inode->i_mapping, start, end);
-       if (ret)
-               return ret;
        mutex_lock(&inode->i_mutex);
 
-       /* we wait first, since the writeback may change the inode */
+       /*
+        * we wait first, since the writeback may change the inode, also wait
+        * ordered range does a filemape_write_and_wait_range which is why we
+        * don't do it above like other file systems.
+        */
        root->log_batch++;
-       btrfs_wait_ordered_range(inode, 0, (u64)-1);
+       btrfs_wait_ordered_range(inode, start, end);
        root->log_batch++;
 
        /*