diff options
| author | Josef Bacik <jbacik@fb.com> | 2015-02-11 15:08:58 -0500 |
|---|---|---|
| committer | Chris Mason <clm@fb.com> | 2015-02-14 08:19:14 -0800 |
| commit | 3266789f9d08b27275bae5ab1dcd27d1bbf15e79 (patch) | |
| tree | b0543175a216240566971738f492b6ab87ac4732 /fs/btrfs | |
| parent | 3e05bde8c3c2dd761da4d52944a087907955a53c (diff) | |
| download | linux-stable-3266789f9d08b27275bae5ab1dcd27d1bbf15e79.tar.gz linux-stable-3266789f9d08b27275bae5ab1dcd27d1bbf15e79.tar.bz2 linux-stable-3266789f9d08b27275bae5ab1dcd27d1bbf15e79.zip | |
Btrfs: don't set and clear delalloc for O_DIRECT writes
We do this to get the space accounting, but this is just needless churn on the
io_tree, so just drop setting/clearing delalloc and just drop the reserved data
space when we have a successfull allocation. Thanks,
Signed-off-by: Josef Bacik <jbacik@fb.com>
Reviewed-by: Liu Bo <bo.li.liu@oracle.com>
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/inode.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 5a5b902e647f..3b957921ba59 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -7160,7 +7160,7 @@ static int btrfs_get_blocks_direct(struct inode *inode, sector_t iblock, int ret = 0; if (create) - unlock_bits |= EXTENT_DELALLOC | EXTENT_DIRTY; + unlock_bits |= EXTENT_DIRTY; else len = min_t(u64, len, root->sectorsize); @@ -7296,11 +7296,7 @@ unlock: BTRFS_I(inode)->outstanding_extents++; spin_unlock(&BTRFS_I(inode)->lock); } - - ret = set_extent_bit(&BTRFS_I(inode)->io_tree, lockstart, - lockstart + len - 1, EXTENT_DELALLOC, NULL, - &cached_state, GFP_NOFS); - BUG_ON(ret); + btrfs_free_reserved_data_space(inode, len); } /* |