diff options
| -rw-r--r-- | ctree.c | 12 | ||||
| -rw-r--r-- | disk-io.c | 3 | ||||
| -rw-r--r-- | disk-io.h | 3 | ||||
| -rw-r--r-- | extent-tree.c | 2 | ||||
| -rw-r--r-- | free-space-tree.c | 2 |
5 files changed, 10 insertions, 12 deletions
@@ -251,7 +251,7 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans, ret = btrfs_dec_ref(trans, root, buf, 1); BUG_ON(ret); } - clean_tree_block(trans, root, buf); + clean_tree_block(buf); } return 0; } @@ -717,7 +717,7 @@ static int balance_level(struct btrfs_trans_handle *trans, root->node = child; add_root_to_dirty_list(root); path->nodes[level] = NULL; - clean_tree_block(trans, root, mid); + clean_tree_block(mid); /* once for the path */ free_extent_buffer(mid); @@ -770,7 +770,7 @@ static int balance_level(struct btrfs_trans_handle *trans, u64 bytenr = right->start; u32 blocksize = right->len; - clean_tree_block(trans, root, right); + clean_tree_block(right); free_extent_buffer(right); right = NULL; wret = btrfs_del_ptr(root, path, level + 1, pslot + 1); @@ -816,7 +816,7 @@ static int balance_level(struct btrfs_trans_handle *trans, /* we've managed to empty the middle node, drop it */ u64 bytenr = mid->start; u32 blocksize = mid->len; - clean_tree_block(trans, root, mid); + clean_tree_block(mid); free_extent_buffer(mid); mid = NULL; wret = btrfs_del_ptr(root, path, level + 1, pslot); @@ -2739,7 +2739,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, if (leaf == root->node) { btrfs_set_header_level(leaf, 0); } else { - clean_tree_block(trans, root, leaf); + clean_tree_block(leaf); wret = btrfs_del_leaf(trans, root, path, leaf); BUG_ON(ret); if (wret) @@ -2775,7 +2775,7 @@ int btrfs_del_items(struct btrfs_trans_handle *trans, struct btrfs_root *root, } if (btrfs_header_nritems(leaf) == 0) { - clean_tree_block(trans, root, leaf); + clean_tree_block(leaf); path->slots[1] = slot; ret = btrfs_del_leaf(trans, root, path, leaf); BUG_ON(ret); @@ -1684,8 +1684,7 @@ skip_commit: return err; } -int clean_tree_block(struct btrfs_trans_handle *trans, struct btrfs_root *root, - struct extent_buffer *eb) +int clean_tree_block(struct extent_buffer *eb) { return clear_extent_buffer_dirty(eb); } @@ -131,8 +131,7 @@ struct extent_buffer* btrfs_find_create_tree_block( void btrfs_setup_root(struct btrfs_root *root, struct btrfs_fs_info *fs_info, u64 objectid); -int clean_tree_block(struct btrfs_trans_handle *trans, - struct btrfs_root *root, struct extent_buffer *buf); +int clean_tree_block(struct extent_buffer *buf); void btrfs_free_fs_info(struct btrfs_fs_info *fs_info); struct btrfs_fs_info *btrfs_new_fs_info(int writable, u64 sb_bytenr); diff --git a/extent-tree.c b/extent-tree.c index 8e7f888b..e06fe56b 100644 --- a/extent-tree.c +++ b/extent-tree.c @@ -2129,7 +2129,7 @@ static int pin_down_bytes(struct btrfs_trans_handle *trans, if (header_owner != BTRFS_TREE_LOG_OBJECTID && header_transid == trans->transid && !btrfs_header_flag(buf, BTRFS_HEADER_FLAG_WRITTEN)) { - clean_tree_block(NULL, root, buf); + clean_tree_block(buf); free_extent_buffer(buf); return 1; } diff --git a/free-space-tree.c b/free-space-tree.c index 69a4eca8..139a031e 100644 --- a/free-space-tree.c +++ b/free-space-tree.c @@ -135,7 +135,7 @@ int btrfs_clear_free_space_tree(struct btrfs_fs_info *fs_info) list_del(&free_space_root->dirty_list); - ret = clean_tree_block(trans, tree_root, free_space_root->node); + ret = clean_tree_block(free_space_root->node); if (ret) goto abort; ret = btrfs_free_tree_block(trans, free_space_root, |