diff options
Diffstat (limited to 'fs/btrfs/extent-tree.c')
-rw-r--r-- | fs/btrfs/extent-tree.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/btrfs/extent-tree.c b/fs/btrfs/extent-tree.c index be9630df506c..d560831c10a7 100644 --- a/fs/btrfs/extent-tree.c +++ b/fs/btrfs/extent-tree.c | |||
@@ -80,7 +80,7 @@ static int lookup_block_ref(struct btrfs_trans_handle *trans, struct btrfs_root | |||
80 | int btrfs_inc_root_ref(struct btrfs_trans_handle *trans, | 80 | int btrfs_inc_root_ref(struct btrfs_trans_handle *trans, |
81 | struct btrfs_root *root) | 81 | struct btrfs_root *root) |
82 | { | 82 | { |
83 | return inc_block_ref(trans, root, root->node->b_blocknr, 1); | 83 | return inc_block_ref(trans, root, bh_blocknr(root->node), 1); |
84 | } | 84 | } |
85 | 85 | ||
86 | int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, | 86 | int btrfs_inc_ref(struct btrfs_trans_handle *trans, struct btrfs_root *root, |
@@ -563,7 +563,7 @@ static int walk_down_tree(struct btrfs_trans_handle *trans, struct btrfs_root | |||
563 | 563 | ||
564 | WARN_ON(*level < 0); | 564 | WARN_ON(*level < 0); |
565 | WARN_ON(*level >= BTRFS_MAX_LEVEL); | 565 | WARN_ON(*level >= BTRFS_MAX_LEVEL); |
566 | ret = lookup_block_ref(trans, root, path->nodes[*level]->b_blocknr, | 566 | ret = lookup_block_ref(trans, root, bh_blocknr(path->nodes[*level]), |
567 | 1, &refs); | 567 | 1, &refs); |
568 | BUG_ON(ret); | 568 | BUG_ON(ret); |
569 | if (refs > 1) | 569 | if (refs > 1) |
@@ -607,7 +607,7 @@ out: | |||
607 | WARN_ON(*level < 0); | 607 | WARN_ON(*level < 0); |
608 | WARN_ON(*level >= BTRFS_MAX_LEVEL); | 608 | WARN_ON(*level >= BTRFS_MAX_LEVEL); |
609 | ret = btrfs_free_extent(trans, root, | 609 | ret = btrfs_free_extent(trans, root, |
610 | path->nodes[*level]->b_blocknr, 1, 1); | 610 | bh_blocknr(path->nodes[*level]), 1, 1); |
611 | btrfs_block_release(root, path->nodes[*level]); | 611 | btrfs_block_release(root, path->nodes[*level]); |
612 | path->nodes[*level] = NULL; | 612 | path->nodes[*level] = NULL; |
613 | *level += 1; | 613 | *level += 1; |
@@ -635,7 +635,7 @@ static int walk_up_tree(struct btrfs_trans_handle *trans, struct btrfs_root | |||
635 | return 0; | 635 | return 0; |
636 | } else { | 636 | } else { |
637 | ret = btrfs_free_extent(trans, root, | 637 | ret = btrfs_free_extent(trans, root, |
638 | path->nodes[*level]->b_blocknr, | 638 | bh_blocknr(path->nodes[*level]), |
639 | 1, 1); | 639 | 1, 1); |
640 | BUG_ON(ret); | 640 | BUG_ON(ret); |
641 | btrfs_block_release(root, path->nodes[*level]); | 641 | btrfs_block_release(root, path->nodes[*level]); |