diff options
author | Josef Bacik <josef@redhat.com> | 2011-08-30 11:40:48 -0400 |
---|---|---|
committer | Josef Bacik <josef@redhat.com> | 2011-10-19 15:12:43 -0400 |
commit | d02c9955ded7fc56dd1edc987558b084ccb03eb4 (patch) | |
tree | ec7c62af5acfa3d8675aeeaa03facfd4f46fcaf3 /fs | |
parent | 4c13d758b7e79c14a0026c1f783f0c79e339b7bb (diff) |
Btrfs: don't get the block_rsv in btrfs_free_tree_block
Since the durable block rsv stuff has been killed there is no need to get the
block_rsv in btrfs_free_tree_block anymore.
Signed-off-by: Josef Bacik <josef@redhat.com>
Diffstat (limited to 'fs')
-rw-r--r-- | fs/btrfs/extent-tree.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index 53f6dbdab510..d236df790156 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -4707,7 +4707,6 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, | |||
4707 | struct extent_buffer *buf, | 4707 | struct extent_buffer *buf, |
4708 | u64 parent, int last_ref) | 4708 | u64 parent, int last_ref) |
4709 | { | 4709 | { |
4710 | struct btrfs_block_rsv *block_rsv; | ||
4711 | struct btrfs_block_group_cache *cache = NULL; | 4710 | struct btrfs_block_group_cache *cache = NULL; |
4712 | int ret; | 4711 | int ret; |
4713 | 4712 | ||
@@ -4722,10 +4721,7 @@ void btrfs_free_tree_block(struct btrfs_trans_handle *trans, | |||
4722 | if (!last_ref) | 4721 | if (!last_ref) |
4723 | return; | 4722 | return; |
4724 | 4723 | ||
4725 | block_rsv = get_block_rsv(trans, root); | ||
4726 | cache = btrfs_lookup_block_group(root->fs_info, buf->start); | 4724 | cache = btrfs_lookup_block_group(root->fs_info, buf->start); |
4727 | if (block_rsv->space_info != cache->space_info) | ||
4728 | goto out; | ||
4729 | 4725 | ||
4730 | if (btrfs_header_generation(buf) == trans->transid) { | 4726 | if (btrfs_header_generation(buf) == trans->transid) { |
4731 | if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) { | 4727 | if (root->root_key.objectid != BTRFS_TREE_LOG_OBJECTID) { |