]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: always use right leaf variable in __push_leaf_left()
authorFilipe Manana <fdmanana@suse.com>
Thu, 13 Nov 2025 11:52:34 +0000 (11:52 +0000)
committerDavid Sterba <dsterba@suse.com>
Mon, 24 Nov 2025 21:42:25 +0000 (22:42 +0100)
The 'right' variable points to path->nodes[0] and path->nodes[0] is never
changed, but some places use 'right' while others refer to path->nodes[0].
Update all sites to use 'right' as not only it's shorter it's also easier
to reason since it means the right leaf and avoids any confusion with the
sibling left leaf.

Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.c

index 7265dd661cde1c379f118ddb4f798990f60427cc..57b7d09d85cc2144068d298c553f6d24aa27d294 100644 (file)
@@ -3428,8 +3428,8 @@ static noinline int __push_leaf_left(struct btrfs_trans_handle *trans,
        /* then fixup the leaf pointer in the path */
        if (path->slots[0] < push_items) {
                path->slots[0] += old_left_nritems;
-               btrfs_tree_unlock(path->nodes[0]);
-               free_extent_buffer(path->nodes[0]);
+               btrfs_tree_unlock(right);
+               free_extent_buffer(right);
                path->nodes[0] = left;
                path->slots[1] -= 1;
        } else {