| Message ID | 4b80e8a3e4abf81e291bf37ed0c5af29d45661b4.1646691255.git.josef@toxicpanda.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | btrfs-progs: initial snapshot_id support | expand |
diff --git a/kernel-shared/ctree.c b/kernel-shared/ctree.c index 758a3882..8846836b 100644 --- a/kernel-shared/ctree.c +++ b/kernel-shared/ctree.c @@ -858,13 +858,13 @@ int btrfs_bin_search(struct extent_buffer *eb, const struct btrfs_key *key, { if (btrfs_header_level(eb) == 0) return generic_bin_search(eb, - offsetof(struct btrfs_leaf, items), + btrfs_item_nr_offset(eb, 0), sizeof(struct btrfs_item), key, btrfs_header_nritems(eb), slot); else return generic_bin_search(eb, - offsetof(struct btrfs_node, ptrs), + btrfs_node_key_ptr_offset(eb, 0), sizeof(struct btrfs_key_ptr), key, btrfs_header_nritems(eb), slot);
In btrfs_bin_search we use offsetof(struct btrfs_*, items/ptrs) to tell where to start searching for our keys. Instead use the appropriate offset helpers to get this information. Signed-off-by: Josef Bacik <josef@toxicpanda.com> --- kernel-shared/ctree.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)