diff options
Diffstat (limited to 'fs/btrfs/ctree.c')
-rw-r--r-- | fs/btrfs/ctree.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c index b83627a372b1..76e57a8c98df 100644 --- a/fs/btrfs/ctree.c +++ b/fs/btrfs/ctree.c | |||
@@ -970,7 +970,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, | |||
970 | if (ret) | 970 | if (ret) |
971 | return ret; | 971 | return ret; |
972 | } | 972 | } |
973 | clean_tree_block(fs_info, buf); | 973 | btrfs_clean_tree_block(buf); |
974 | *last_ref = 1; | 974 | *last_ref = 1; |
975 | } | 975 | } |
976 | return 0; | 976 | return 0; |
@@ -1888,7 +1888,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, | |||
1888 | 1888 | ||
1889 | path->locks[level] = 0; | 1889 | path->locks[level] = 0; |
1890 | path->nodes[level] = NULL; | 1890 | path->nodes[level] = NULL; |
1891 | clean_tree_block(fs_info, mid); | 1891 | btrfs_clean_tree_block(mid); |
1892 | btrfs_tree_unlock(mid); | 1892 | btrfs_tree_unlock(mid); |
1893 | /* once for the path */ | 1893 | /* once for the path */ |
1894 | free_extent_buffer(mid); | 1894 | free_extent_buffer(mid); |
@@ -1949,7 +1949,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, | |||
1949 | if (wret < 0 && wret != -ENOSPC) | 1949 | if (wret < 0 && wret != -ENOSPC) |
1950 | ret = wret; | 1950 | ret = wret; |
1951 | if (btrfs_header_nritems(right) == 0) { | 1951 | if (btrfs_header_nritems(right) == 0) { |
1952 | clean_tree_block(fs_info, right); | 1952 | btrfs_clean_tree_block(right); |
1953 | btrfs_tree_unlock(right); | 1953 | btrfs_tree_unlock(right); |
1954 | del_ptr(root, path, level + 1, pslot + 1); | 1954 | del_ptr(root, path, level + 1, pslot + 1); |
1955 | root_sub_used(root, right->len); | 1955 | root_sub_used(root, right->len); |
@@ -1994,7 +1994,7 @@ static noinline int balance_level(struct btrfs_trans_handle *trans, | |||
1994 | BUG_ON(wret == 1); | 1994 | BUG_ON(wret == 1); |
1995 | } | 1995 | } |
1996 | if (btrfs_header_nritems(mid) == 0) { | 1996 | if (btrfs_header_nritems(mid) == 0) { |
1997 | clean_tree_block(fs_info, mid); | 1997 | btrfs_clean_tree_block(mid); |
1998 | btrfs_tree_unlock(mid); | 1998 | btrfs_tree_unlock(mid); |
1999 | del_ptr(root, path, level + 1, pslot); | 1999 | del_ptr(root, path, level + 1, pslot); |
2000 | root_sub_used(root, mid->len); | 2000 | root_sub_used(root, mid->len); |
@@ -3704,7 +3704,7 @@ static noinline int __push_leaf_right(struct btrfs_fs_info *fs_info, | |||
3704 | if (left_nritems) | 3704 | if (left_nritems) |
3705 | btrfs_mark_buffer_dirty(left); | 3705 | btrfs_mark_buffer_dirty(left); |
3706 | else | 3706 | else |
3707 | clean_tree_block(fs_info, left); | 3707 | btrfs_clean_tree_block(left); |
3708 | 3708 | ||
3709 | btrfs_mark_buffer_dirty(right); | 3709 | btrfs_mark_buffer_dirty(right); |
3710 | 3710 | ||
@@ -3716,7 +3716,7 @@ static noinline int __push_leaf_right(struct btrfs_fs_info *fs_info, | |||
3716 | if (path->slots[0] >= left_nritems) { | 3716 | if (path->slots[0] >= left_nritems) { |
3717 | path->slots[0] -= left_nritems; | 3717 | path->slots[0] -= left_nritems; |
3718 | if (btrfs_header_nritems(path->nodes[0]) == 0) | 3718 | if (btrfs_header_nritems(path->nodes[0]) == 0) |
3719 | clean_tree_block(fs_info, path->nodes[0]); | 3719 | btrfs_clean_tree_block(path->nodes[0]); |
3720 | btrfs_tree_unlock(path->nodes[0]); | 3720 | btrfs_tree_unlock(path->nodes[0]); |
3721 | free_extent_buffer(path->nodes[0]); | 3721 | free_extent_buffer(path->nodes[0]); |
3722 | path->nodes[0] = right; | 3722 | path->nodes[0] = right; |
@@ -3944,7 +3944,7 @@ static noinline int __push_leaf_left(struct btrfs_fs_info *fs_info, | |||
3944 | if (right_nritems) | 3944 | if (right_nritems) |
3945 | btrfs_mark_buffer_dirty(right); | 3945 | btrfs_mark_buffer_dirty(right); |
3946 | else | 3946 | else |
3947 | clean_tree_block(fs_info, right); | 3947 | btrfs_clean_tree_block(right); |
3948 | 3948 | ||
3949 | btrfs_item_key(right, &disk_key, 0); | 3949 | btrfs_item_key(right, &disk_key, 0); |
3950 | fixup_low_keys(path, &disk_key, 1); | 3950 | fixup_low_keys(path, &disk_key, 1); |
@@ -5005,7 +5005,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
5005 | btrfs_set_header_level(leaf, 0); | 5005 | btrfs_set_header_level(leaf, 0); |
5006 | } else { | 5006 | } else { |
5007 | btrfs_set_path_blocking(path); | 5007 | btrfs_set_path_blocking(path); |
5008 | clean_tree_block(fs_info, leaf); | 5008 | btrfs_clean_tree_block(leaf); |
5009 | btrfs_del_leaf(trans, root, path, leaf); | 5009 | btrfs_del_leaf(trans, root, path, leaf); |
5010 | } | 5010 | } |
5011 | } else { | 5011 | } else { |