[06/26] btrfs-progs: update read_node_slot to match the kernel definition

Message ID	a513866dca1fa1aa1b7393d944ffee6b1edbb96d.1682799405.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 06/26] btrfs-progs: update read_node_slot to match the kernel definition Date: Sat, 29 Apr 2023 16:19:37 -0400 Message-Id: <a513866dca1fa1aa1b7393d944ffee6b1edbb96d.1682799405.git.josef@toxicpanda.com> In-Reply-To: <cover.1682799405.git.josef@toxicpanda.com> References: <cover.1682799405.git.josef@toxicpanda.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	btrfs-progs: sync ctree.c into btrfs-progs \| expand [00/26] btrfs-progs: sync ctree.c into btrfs-progs [01/26] btrfs-progs: stop using add_root_to_dirty_list in check [02/26] btrfs-progs: remove useless add_root_to_dirty_list call in mkfs [03/26] btrfs-progs: remove add_root_to_dirty_list call when creating free space tree [04/26] btrfs-progs: make add_root_to_dirty_list static and unexport it [05/26] btrfs-progs: pass btrfs_trans_handle through btrfs_clear_buffer_dirty [06/26] btrfs-progs: update read_node_slot to match the kernel definition [07/26] btrfs-progs: update btrfs_bin_search to match the kernel definition [08/26] btrfs-progs: update btrfs_set_item_key_safe to match kernel definition [09/26] btrfs-progs: update btrfs_print_leaf to match the kernel definition [10/26] btrfs-progs: update btrfs_truncate_item to match the kernel definition [11/26] btrfs-progs: update btrfs_extend_item to match the kernel definition [12/26] btrfs-progs: sync memcpy_extent_buffer from the kernel [13/26] btrfs-progs: change how we check supported csum type [14/26] btrfs-progs: drop btrfs_init_path [15/26] btrfs-progs: move btrfs_set_item_key_unsafe to check/ [16/26] btrfs-progs: move btrfs_record_file_extent and code into a new file [17/26] btrfs-progs: make a local copy of btrfs_next_sibling_block in print-tree.c [18/26] btrfs-progs: don't set the ->commit_root in btrfs_create_tree [19/26] btrfs-progs: remove btrfs_create_root [20/26] btrfs-progs: move btrfs_uuid_tree_add into mkfs/main.c [21/26] btrfs-progs: make btrfs_del_ptr a void [22/26] btrfs-progs: replace blocksize with parent argument for btrfs_alloc_tree_block [23/26] btrfs-progs: use path->search_for_extension [24/26] btrfs-progs: add write_extent_buffer_chunk_tree_uuid helper [25/26] btrfs-progs: init new tree blocks in btrfs_alloc_tree_block [26/26] btrfs-progs: sync ctree.c from the kernel

diff --git a/cmds/restore.c b/cmds/restore.c index 9fe7b4d2..31cad31f 100644 --- a/cmds/restore.c +++ b/cmds/restore.c @@ -240,7 +240,6 @@ static int next_leaf(struct btrfs_root *root, struct btrfs_path *path) int offset = 1; struct extent_buffer *c; struct extent_buffer *next = NULL; - struct btrfs_fs_info *fs_info = root->fs_info; again: for (; level < BTRFS_MAX_LEVEL; level++) { @@ -267,7 +266,7 @@ again: continue; } - next = read_node_slot(fs_info, c, slot); + next = btrfs_read_node_slot(c, slot); if (extent_buffer_uptodate(next)) break; offset++; @@ -281,7 +280,7 @@ again: path->slots[level] = 0; if (!level) break; - next = read_node_slot(fs_info, next, 0); + next = btrfs_read_node_slot(next, 0); if (!extent_buffer_uptodate(next)) goto again; } diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c index b127dcf9..cbf735de 100644 --- a/kernel-shared/ctree.c +++ b/kernel-shared/ctree.c @@ -681,9 +681,10 @@ int btrfs_bin_search(struct extent_buffer *eb, const struct btrfs_key *key, slot); } -struct extent_buffer *read_node_slot(struct btrfs_fs_info *fs_info, - struct extent_buffer *parent, int slot) +struct extent_buffer *btrfs_read_node_slot(struct extent_buffer *parent, + int slot) { + struct btrfs_fs_info *fs_info = parent->fs_info; struct extent_buffer *ret; int level = btrfs_header_level(parent); @@ -752,7 +753,7 @@ static int balance_level(struct btrfs_trans_handle *trans, return 0; /* promote the child to a root */ - child = read_node_slot(fs_info, mid, 0); + child = btrfs_read_node_slot(mid, 0); BUG_ON(!extent_buffer_uptodate(child)); ret = btrfs_cow_block(trans, root, child, mid, 0, &child); BUG_ON(ret); @@ -776,7 +777,7 @@ static int balance_level(struct btrfs_trans_handle *trans, BTRFS_NODEPTRS_PER_BLOCK(fs_info) / 4) return 0; - left = read_node_slot(fs_info, parent, pslot - 1); + left = btrfs_read_node_slot(parent, pslot - 1); if (extent_buffer_uptodate(left)) { wret = btrfs_cow_block(trans, root, left, parent, pslot - 1, &left); @@ -785,7 +786,7 @@ static int balance_level(struct btrfs_trans_handle *trans, goto enospc; } } - right = read_node_slot(fs_info, parent, pslot + 1); + right = btrfs_read_node_slot(parent, pslot + 1); if (extent_buffer_uptodate(right)) { wret = btrfs_cow_block(trans, root, right, parent, pslot + 1, &right); @@ -937,7 +938,7 @@ static int noinline push_nodes_for_insert(struct btrfs_trans_handle *trans, if (!parent) return 1; - left = read_node_slot(fs_info, parent, pslot - 1); + left = btrfs_read_node_slot(parent, pslot - 1); /* first, try to make some room in the middle buffer */ if (extent_buffer_uptodate(left)) { @@ -978,7 +979,7 @@ static int noinline push_nodes_for_insert(struct btrfs_trans_handle *trans, } free_extent_buffer(left); } - right= read_node_slot(fs_info, parent, pslot + 1); + right= btrfs_read_node_slot(parent, pslot + 1); /* * then try to empty the right most buffer into the middle @@ -1230,7 +1231,7 @@ again: reada_for_search(fs_info, p, level, slot, key->objectid); - b = read_node_slot(fs_info, b, slot); + b = btrfs_read_node_slot(b, slot); if (!extent_buffer_uptodate(b)) return -EIO; } else { @@ -1789,7 +1790,6 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root struct extent_buffer *right; struct extent_buffer *upper; struct btrfs_disk_key disk_key; - struct btrfs_fs_info *fs_info = root->fs_info; int slot; u32 i; int free_space; @@ -1810,7 +1810,7 @@ static int push_leaf_right(struct btrfs_trans_handle *trans, struct btrfs_root if (slot >= btrfs_header_nritems(upper) - 1) return 1; - right = read_node_slot(fs_info, upper, slot + 1); + right = btrfs_read_node_slot(upper, slot + 1); if (!extent_buffer_uptodate(right)) { if (IS_ERR(right)) return PTR_ERR(right); @@ -1938,7 +1938,6 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root struct btrfs_disk_key disk_key; struct extent_buffer *right = path->nodes[0]; struct extent_buffer *left; - struct btrfs_fs_info *fs_info = root->fs_info; int slot; int i; int free_space; @@ -1962,7 +1961,7 @@ static int push_leaf_left(struct btrfs_trans_handle *trans, struct btrfs_root return 1; } - left = read_node_slot(fs_info, path->nodes[1], slot - 1); + left = btrfs_read_node_slot(path->nodes[1], slot - 1); free_space = btrfs_leaf_free_space(left); if (free_space < data_size) { free_extent_buffer(left); @@ -2898,7 +2897,6 @@ int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) int level = 1; struct extent_buffer *c; struct extent_buffer *next = NULL; - struct btrfs_fs_info *fs_info = root->fs_info; while(level < BTRFS_MAX_LEVEL) { if (!path->nodes[level]) @@ -2914,7 +2912,7 @@ int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) } slot--; - next = read_node_slot(fs_info, c, slot); + next = btrfs_read_node_slot(c, slot); if (!extent_buffer_uptodate(next)) { if (IS_ERR(next)) return PTR_ERR(next); @@ -2934,7 +2932,7 @@ int btrfs_prev_leaf(struct btrfs_root *root, struct btrfs_path *path) path->slots[level] = slot; if (!level) break; - next = read_node_slot(fs_info, next, slot); + next = btrfs_read_node_slot(next, slot); if (!extent_buffer_uptodate(next)) { if (IS_ERR(next)) return PTR_ERR(next); @@ -2977,7 +2975,7 @@ int btrfs_next_sibling_tree_block(struct btrfs_fs_info *fs_info, if (path->reada) reada_for_search(fs_info, path, level, slot, 0); - next = read_node_slot(fs_info, c, slot); + next = btrfs_read_node_slot(c, slot); if (!extent_buffer_uptodate(next)) return -EIO; break; @@ -3000,7 +2998,7 @@ int btrfs_next_sibling_tree_block(struct btrfs_fs_info *fs_info, break; if (path->reada) reada_for_search(fs_info, path, level, 0, 0); - next = read_node_slot(fs_info, next, 0); + next = btrfs_read_node_slot(next, 0); if (!extent_buffer_uptodate(next)) return -EIO; } diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index ce050cec..edf74fcc 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -948,8 +948,8 @@ int btrfs_convert_one_bg(struct btrfs_trans_handle *trans, u64 bytenr); int btrfs_comp_cpu_keys(const struct btrfs_key *k1, const struct btrfs_key *k2); int btrfs_del_ptr(struct btrfs_root *root, struct btrfs_path *path, int level, int slot); -struct extent_buffer *read_node_slot(struct btrfs_fs_info *fs_info, - struct extent_buffer *parent, int slot); +struct extent_buffer *btrfs_read_node_slot(struct extent_buffer *parent, + int slot); int btrfs_previous_item(struct btrfs_root *root, struct btrfs_path *path, u64 min_objectid, int type); diff --git a/kernel-shared/print-tree.c b/kernel-shared/print-tree.c index 6cdfdef7..594c524f 100644 --- a/kernel-shared/print-tree.c +++ b/kernel-shared/print-tree.c @@ -1487,7 +1487,7 @@ static int search_leftmost_tree_block(struct btrfs_fs_info *fs_info, struct extent_buffer *eb; path->slots[i] = 0; - eb = read_node_slot(fs_info, path->nodes[i], 0); + eb = btrfs_read_node_slot(path->nodes[i], 0); if (!extent_buffer_uptodate(eb)) { ret = -EIO; goto out;

[06/26] btrfs-progs: update read_node_slot to match the kernel definition

Commit Message

Patch