]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
btrfs: always use left leaf variable in __push_leaf_right()
authorFilipe Manana <fdmanana@suse.com>
Thu, 13 Nov 2025 11:32:44 +0000 (11:32 +0000)
committerDavid Sterba <dsterba@suse.com>
Mon, 24 Nov 2025 21:42:25 +0000 (22:42 +0100)
The 'left' variable points to path->nodes[0] and path->nodes[0] is never
changed, but some places use 'left' while others refer to path->nodes[0].
Update all sites to use 'left' as not only it's shorter it's also easier
to reason since it means the left leaf and avoids any confusion with the
sibling right 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 b5cf1b6f5adccfe1d2fb73126651e11b8c5baaab..dada50d867317064def37a460a2d691abc17c33d 100644 (file)
@@ -3214,10 +3214,10 @@ static noinline int __push_leaf_right(struct btrfs_trans_handle *trans,
        /* then fixup the leaf pointer in the path */
        if (path->slots[0] >= left_nritems) {
                path->slots[0] -= left_nritems;
-               if (btrfs_header_nritems(path->nodes[0]) == 0)
-                       btrfs_clear_buffer_dirty(trans, path->nodes[0]);
-               btrfs_tree_unlock(path->nodes[0]);
-               free_extent_buffer(path->nodes[0]);
+               if (btrfs_header_nritems(left) == 0)
+                       btrfs_clear_buffer_dirty(trans, left);
+               btrfs_tree_unlock(left);
+               free_extent_buffer(left);
                path->nodes[0] = right;
                path->slots[1] += 1;
        } else {