btrfs: Use next_leaf instead of next_item when slots > nritems
PATCH 1/1 btrfs: Use next_leaf instead of next_item when slots > nritems
After calling btrfs_search_slot is a common pratice to check if the slot found isn't bigger than number of slots in the current leaf, and if so, search for the same key in the next leaf by calling btrfs_next_leaf, which calls btrfs_next_old_leaf to do the job.
Calling btrfs_next_item in the same situation would end up in the same code flow, since
* btrfs_next_item
* btrfs_next_old_item
* if slot >= nritems(curr_leaf)
btrfs_next_old_leaf
Change btrfs_verify_dev_extents and calculate_emulated_zone_size functions to use btrfs_next_leaf in the same situation.
---
Please let me know if I'm missing something obvious here, but all other places who check for slot >= nritems are calling next_leaf...
I found this code while checking all btrfs_search_slot users.
fs/btrfs/volumes.c | 2 +- fs/btrfs/zoned.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-)
fs/btrfs/volumes.c +1 -1
@@ -8143,7 +8143,7 @@ int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info) goto out;if (path->slots[0 ] >=btrfs_header_nritems (path->nodes[0 ])) { - ret =btrfs_next_item (root, path); + ret =btrfs_next_leaf (root, path);if (ret <0 ) goto out;/* No dev extents at all? Not good */
fs/btrfs/zoned.c +1 -1
@@ -245,7 +245,7 @@ static int calculate_emulated_zone_size(struct btrfs_fs_info *fs_info) goto out;if (path->slots[0 ] >=btrfs_header_nritems (path->nodes[0 ])) { - ret =btrfs_next_item (root, path); + ret =btrfs_next_leaf (root, path);if (ret <0 ) goto out;/* No dev extents at all? Not good */
Signature · 1 line
2.26.2
Quoted 13 lines · Marcos Paulo de Souza
After calling
btrfs_search_slotis a common pratice to check if the slot found isn't bigger than number of slots in the current leaf, and if so, search for the same key in the next leaf by callingbtrfs_next_leaf, which callsbtrfs_next_old_leafto do the job.Calling
btrfs_next_itemin the same situation would end up in the same code flow, since*
btrfs_next_item
*btrfs_next_old_item
* if slot >=nritems(curr_leaf)
btrfs_next_old_leaf
Quoted 7 lines
Change
btrfs_verify_dev_extentsandcalculate_emulated_zone_sizefunctions to usebtrfs_next_leafin the same situation.Signed-off-by Marcos Paulo de Souza <[email protected]>---
Please let me know if I'm missing something obvious here, but all other places who check for slot >= nritems are callingnext_leaf...
Yeah it should be next_leaf, the next_item increments the slot but at that time it is already above nritems and it gets reset to 0 once the pointer is moved to the next leaf.
Added to misc-next, thanks.