diff options
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index ccd49322f793..c51cd11de206 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -1451,7 +1451,7 @@ static int pin_down_bytes(struct btrfs_root *root, u64 bytenr, u32 num_bytes, | |||
1451 | struct extent_buffer *buf; | 1451 | struct extent_buffer *buf; |
1452 | buf = btrfs_find_tree_block(root, bytenr, num_bytes); | 1452 | buf = btrfs_find_tree_block(root, bytenr, num_bytes); |
1453 | if (buf) { | 1453 | if (buf) { |
1454 | if (!btrfs_try_tree_lock(buf) && | 1454 | if (btrfs_try_tree_lock(buf) && |
1455 | btrfs_buffer_uptodate(buf, 0)) { | 1455 | btrfs_buffer_uptodate(buf, 0)) { |
1456 | u64 transid = | 1456 | u64 transid = |
1457 | root->fs_info->running_transaction->transid; | 1457 | root->fs_info->running_transaction->transid; |
@@ -3345,11 +3345,6 @@ int btrfs_read_block_groups(struct btrfs_root *root) | |||
3345 | set_state_private(block_group_cache, found_key.objectid, | 3345 | set_state_private(block_group_cache, found_key.objectid, |
3346 | (unsigned long)cache); | 3346 | (unsigned long)cache); |
3347 | 3347 | ||
3348 | /* hack for now */ | ||
3349 | if (cache->flags & BTRFS_BLOCK_GROUP_METADATA) { | ||
3350 | cache_block_group(root->fs_info->extent_root, | ||
3351 | cache); | ||
3352 | } | ||
3353 | if (key.objectid >= | 3348 | if (key.objectid >= |
3354 | btrfs_super_total_bytes(&info->super_copy)) | 3349 | btrfs_super_total_bytes(&info->super_copy)) |
3355 | break; | 3350 | break; |