[03/18] btrfs-progs: remove root argument from free_extent and inc_extent_ref

Message ID	49d525ba3ef5dc1a8b31b829e4f8ecd809a0cb46.1681939316.git.josef@toxicpanda.com (mailing list archive)
State	New, archived
Headers	show Return-Path: <linux-btrfs-owner@vger.kernel.org> From: Josef Bacik <josef@toxicpanda.com> To: linux-btrfs@vger.kernel.org, kernel-team@fb.com Subject: [PATCH 03/18] btrfs-progs: remove root argument from free_extent and inc_extent_ref Date: Wed, 19 Apr 2023 17:23:54 -0400 Message-Id: <49d525ba3ef5dc1a8b31b829e4f8ecd809a0cb46.1681939316.git.josef@toxicpanda.com> In-Reply-To: <cover.1681939316.git.josef@toxicpanda.com> References: <cover.1681939316.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	btrfs-progs: more prep work for syncing ctree.c \| expand [00/18] btrfs-progs: more prep work for syncing ctree.c [01/18] btrfs-progs: sync and stub-out tree-mod-log.h [02/18] btrfs-progs: add btrfs_root_id helper [03/18] btrfs-progs: remove root argument from free_extent and inc_extent_ref [04/18] btrfs-progs: pass root_id for btrfs_free_tree_block [05/18] btrfs-progs: add a free_extent_buffer_stale helper [06/18] btrfs-progs: add btrfs_is_testing helper [07/18] btrfs-progs: add accounting_lock to btrfs_root [08/18] btrfs-progs: update read_tree_block to match the kernel definition [09/18] btrfs-progs: make reada_for_search static [10/18] btrfs-progs: sync btrfs_path fields with the kernel [11/18] btrfs-progs: update arguments of find_extent_buffer [12/18] btrfs-progs: add btrfs_readahead_node_child helper [13/18] btrfs-progs: add an atomic arg to btrfs_buffer_uptodate [14/18] btrfs-progs: add a btrfs_read_extent_buffer helper [15/18] btrfs-progs: add BTRFS_STRIPE_LEN_SHIFT definition [16/18] btrfs-progs: rename btrfs_check_* to __btrfs_check_* [17/18] btrfs-progs: change btrfs_check_chunk_valid to match the kernel version [18/18] btrfs-progs: sync tree-checker.[ch]

diff --git a/check/clear-cache.c b/check/clear-cache.c index 5ffdd430..031379ce 100644 --- a/check/clear-cache.c +++ b/check/clear-cache.c @@ -513,8 +513,9 @@ int truncate_free_ino_items(struct btrfs_root *root) extent_offset = found_key.offset - btrfs_file_extent_offset(leaf, fi); UASSERT(extent_offset == 0); - ret = btrfs_free_extent(trans, root, extent_disk_bytenr, - extent_num_bytes, 0, root->objectid, + ret = btrfs_free_extent(trans, extent_disk_bytenr, + extent_num_bytes, 0, + root->objectid, BTRFS_FREE_INO_OBJECTID, 0); if (ret < 0) { btrfs_abort_transaction(trans, ret); diff --git a/check/main.c b/check/main.c index 09805511..275f912b 100644 --- a/check/main.c +++ b/check/main.c @@ -3586,7 +3586,7 @@ static int repair_btree(struct btrfs_root *root, * return value is not concerned. */ btrfs_release_path(&path); - ret = btrfs_free_extent(trans, root, offset, + ret = btrfs_free_extent(trans, offset, gfs_info->nodesize, 0, root->root_key.objectid, level - 1, 0); cache = next_cache_extent(cache); @@ -6861,9 +6861,8 @@ static int record_extent(struct btrfs_trans_handle *trans, * just makes the backref allocator create a data * backref */ - ret = btrfs_inc_extent_ref(trans, extent_root, - rec->start, rec->max_size, - parent, + ret = btrfs_inc_extent_ref(trans, rec->start, + rec->max_size, parent, dback->root, parent ? BTRFS_FIRST_FREE_OBJECTID : @@ -6890,8 +6889,7 @@ static int record_extent(struct btrfs_trans_handle *trans, else parent = 0; - ret = btrfs_inc_extent_ref(trans, extent_root, - rec->start, rec->max_size, + ret = btrfs_inc_extent_ref(trans, rec->start, rec->max_size, parent, tback->root, 0, 0); fprintf(stderr, "adding new tree backref on start %llu len %llu parent %llu root %llu\n", diff --git a/check/mode-lowmem.c b/check/mode-lowmem.c index 0bc95930..10f86161 100644 --- a/check/mode-lowmem.c +++ b/check/mode-lowmem.c @@ -755,8 +755,8 @@ static int repair_tree_block_ref(struct btrfs_root *root, parent = nrefs->bytenr[level + 1]; /* increase the ref */ - ret = btrfs_inc_extent_ref(trans, extent_root, bytenr, node_size, - parent, root->objectid, level, 0); + ret = btrfs_inc_extent_ref(trans, bytenr, node_size, parent, + root->objectid, level, 0); nrefs->refs[level]++; out: @@ -3335,7 +3335,7 @@ static int repair_extent_data_item(struct btrfs_root *root, btrfs_release_path(&path); } - ret = btrfs_inc_extent_ref(trans, root, disk_bytenr, num_bytes, parent, + ret = btrfs_inc_extent_ref(trans, disk_bytenr, num_bytes, parent, root->objectid, parent ? BTRFS_FIRST_FREE_OBJECTID : fi_key.objectid, offset); @@ -4132,8 +4132,8 @@ static int repair_extent_item(struct btrfs_path *path, u64 bytenr, u64 goto out; } /* delete the backref */ - ret = btrfs_free_extent(trans, gfs_info->fs_root, bytenr, - num_bytes, parent, root_objectid, owner, offset); + ret = btrfs_free_extent(trans, bytenr, num_bytes, parent, root_objectid, + owner, offset); if (!ret) printf("Delete backref in extent [%llu %llu]\n", bytenr, num_bytes); diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c index da9282b9..c3e9830a 100644 --- a/kernel-shared/ctree.c +++ b/kernel-shared/ctree.c @@ -491,8 +491,8 @@ static int __btrfs_cow_block(struct btrfs_trans_handle *trans, root->node = cow; extent_buffer_get(cow); - btrfs_free_extent(trans, root, buf->start, buf->len, - 0, root->root_key.objectid, level, 0); + btrfs_free_extent(trans, buf->start, buf->len, 0, + root->root_key.objectid, level, 0); free_extent_buffer(buf); add_root_to_dirty_list(root); } else { @@ -504,8 +504,8 @@ static int __btrfs_cow_block(struct btrfs_trans_handle *trans, btrfs_mark_buffer_dirty(parent); WARN_ON(btrfs_header_generation(parent) != trans->transid); - btrfs_free_extent(trans, root, buf->start, buf->len, - 0, root->root_key.objectid, level, 0); + btrfs_free_extent(trans, buf->start, buf->len, 0, + root->root_key.objectid, level, 0); } if (!list_empty(&buf->recow)) { list_del_init(&buf->recow); @@ -942,9 +942,8 @@ static int balance_level(struct btrfs_trans_handle *trans, root_sub_used(root, mid->len); - ret = btrfs_free_extent(trans, root, mid->start, mid->len, - 0, root->root_key.objectid, - level, 0); + ret = btrfs_free_extent(trans, mid->start, mid->len, 0, + root->root_key.objectid, level, 0); /* once for the root ptr */ free_extent_buffer(mid); return ret; @@ -999,10 +998,9 @@ static int balance_level(struct btrfs_trans_handle *trans, ret = wret; root_sub_used(root, blocksize); - wret = btrfs_free_extent(trans, root, bytenr, - blocksize, 0, - root->root_key.objectid, - level, 0); + wret = btrfs_free_extent(trans, bytenr, blocksize, 0, + root->root_key.objectid, level, + 0); if (wret) ret = wret; } else { @@ -1047,9 +1045,8 @@ static int balance_level(struct btrfs_trans_handle *trans, ret = wret; root_sub_used(root, blocksize); - wret = btrfs_free_extent(trans, root, bytenr, blocksize, - 0, root->root_key.objectid, - level, 0); + wret = btrfs_free_extent(trans, bytenr, blocksize, 0, + root->root_key.objectid, level, 0); if (wret) ret = wret; } else { @@ -2956,8 +2953,8 @@ static noinline int btrfs_del_leaf(struct btrfs_trans_handle *trans, root_sub_used(root, leaf->len); - ret = btrfs_free_extent(trans, root, leaf->start, leaf->len, - 0, root->root_key.objectid, 0, 0); + ret = btrfs_free_extent(trans, leaf->start, leaf->len, 0, + root->root_key.objectid, 0, 0); return ret; } diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index d5cd7803..2f41b58d 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -875,12 +875,10 @@ int btrfs_free_tree_block(struct btrfs_trans_handle *trans, struct extent_buffer *buf, u64 parent, int last_ref); int btrfs_free_extent(struct btrfs_trans_handle *trans, - struct btrfs_root *root, u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid, u64 owner, u64 offset); void btrfs_finish_extent_commit(struct btrfs_trans_handle *trans); int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, - struct btrfs_root *root, u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid, u64 owner, u64 offset); int btrfs_update_extent_ref(struct btrfs_trans_handle *trans, diff --git a/kernel-shared/extent-tree.c b/kernel-shared/extent-tree.c index 4dfb35d4..8d4483cd 100644 --- a/kernel-shared/extent-tree.c +++ b/kernel-shared/extent-tree.c @@ -1242,11 +1242,10 @@ static int remove_extent_backref(struct btrfs_trans_handle *trans, } int btrfs_inc_extent_ref(struct btrfs_trans_handle *trans, - struct btrfs_root *root, u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid, u64 owner, u64 offset) { - struct btrfs_root *extent_root = btrfs_extent_root(root->fs_info, + struct btrfs_root *extent_root = btrfs_extent_root(trans->fs_info, bytenr); struct btrfs_path *path; struct extent_buffer *leaf; @@ -1467,7 +1466,6 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, int level; int ret = 0; int (*process_func)(struct btrfs_trans_handle *trans, - struct btrfs_root *root, u64, u64, u64, u64, u64, u64); ref_root = btrfs_header_owner(buf); @@ -1504,9 +1502,8 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, num_bytes = btrfs_file_extent_disk_num_bytes(buf, fi); key.offset -= btrfs_file_extent_offset(buf, fi); - ret = process_func(trans, root, bytenr, num_bytes, - parent, ref_root, key.objectid, - key.offset); + ret = process_func(trans, bytenr, num_bytes, parent, + ref_root, key.objectid, key.offset); if (ret) { WARN_ON(1); goto fail; @@ -1514,8 +1511,8 @@ static int __btrfs_mod_ref(struct btrfs_trans_handle *trans, } else { bytenr = btrfs_node_blockptr(buf, i); num_bytes = root->fs_info->nodesize; - ret = process_func(trans, root, bytenr, num_bytes, - parent, ref_root, level - 1, 0); + ret = process_func(trans, bytenr, num_bytes, parent, + ref_root, level - 1, 0); if (ret) { WARN_ON(1); goto fail; @@ -2148,7 +2145,7 @@ int btrfs_free_tree_block(struct btrfs_trans_handle *trans, struct extent_buffer *buf, u64 parent, int last_ref) { - return btrfs_free_extent(trans, root, buf->start, buf->len, parent, + return btrfs_free_extent(trans, buf->start, buf->len, parent, root->root_key.objectid, btrfs_header_level(buf), 0); } @@ -2158,13 +2155,12 @@ int btrfs_free_tree_block(struct btrfs_trans_handle *trans, */ int btrfs_free_extent(struct btrfs_trans_handle *trans, - struct btrfs_root *root, u64 bytenr, u64 num_bytes, u64 parent, u64 root_objectid, u64 owner, u64 offset) { int ret; - WARN_ON(num_bytes < root->fs_info->sectorsize); + WARN_ON(num_bytes < trans->fs_info->sectorsize); /* * tree log blocks never actually go into the extent allocation * tree, just update pinning info and exit early. @@ -2579,8 +2575,8 @@ struct extent_buffer *btrfs_alloc_tree_block(struct btrfs_trans_handle *trans, buf = btrfs_find_create_tree_block(root->fs_info, ins.objectid); if (!buf) { - btrfs_free_extent(trans, root, ins.objectid, ins.offset, - 0, root->root_key.objectid, level, 0); + btrfs_free_extent(trans, ins.objectid, ins.offset, 0, + root->root_key.objectid, level, 0); BUG_ON(1); return ERR_PTR(-ENOMEM); } @@ -3723,7 +3719,7 @@ static int __btrfs_record_file_extent(struct btrfs_trans_handle *trans, btrfs_set_stack_inode_nbytes(inode, nbytes); btrfs_release_path(path); - ret = btrfs_inc_extent_ref(trans, root, extent_bytenr, extent_num_bytes, + ret = btrfs_inc_extent_ref(trans, extent_bytenr, extent_num_bytes, 0, root->root_key.objectid, objectid, file_pos - extent_offset); if (ret) diff --git a/kernel-shared/free-space-cache.c b/kernel-shared/free-space-cache.c index 83897f10..7bd76e39 100644 --- a/kernel-shared/free-space-cache.c +++ b/kernel-shared/free-space-cache.c @@ -982,9 +982,8 @@ int btrfs_clear_free_space_cache(struct btrfs_trans_handle *trans, disk_bytenr = btrfs_file_extent_disk_bytenr(node, fi); disk_num_bytes = btrfs_file_extent_disk_num_bytes(node, fi); - ret = btrfs_free_extent(trans, tree_root, disk_bytenr, - disk_num_bytes, 0, tree_root->objectid, - ino, key.offset); + ret = btrfs_free_extent(trans, disk_bytenr, disk_num_bytes, 0, + tree_root->objectid, ino, key.offset); if (ret < 0) { error("failed to remove backref for disk bytenr %llu: %d", disk_bytenr, ret);

[03/18] btrfs-progs: remove root argument from free_extent and inc_extent_ref

Commit Message

Patch