diff options
| author | Josef Bacik <josef@redhat.com> | 2012-04-23 15:09:39 -0400 |
|---|---|---|
| committer | Josef Bacik <josef@redhat.com> | 2012-05-30 10:23:29 -0400 |
| commit | 0885ef5b5601e9b007c383e77c172769b1f214fd (patch) | |
| tree | 637186daaaa3201ca534e9981b574e538245e39e | |
| parent | 551ebb2d34304ee2abfe6b00d39ec65d5e4e8266 (diff) | |
| download | linux-3.10-0885ef5b5601e9b007c383e77c172769b1f214fd.tar.gz linux-3.10-0885ef5b5601e9b007c383e77c172769b1f214fd.tar.bz2 linux-3.10-0885ef5b5601e9b007c383e77c172769b1f214fd.zip | |
Btrfs: do not do filemap_write_and_wait_range in fsync
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>
| -rw-r--r-- | fs/btrfs/file.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index 8aa8d7fe74d..cfc0ab915d0 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -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++; /* |