btrfs: rename err to ret2 in btrfs_search_old_slot()
authorDavid Sterba <dsterba@suse.com>
Fri, 30 May 2025 16:17:26 +0000 (18:17 +0200)
committerDavid Sterba <dsterba@suse.com>
Mon, 21 Jul 2025 21:53:27 +0000 (23:53 +0200)
Unify naming of return value to the preferred way, move the variable to
the closest scope.

Reviewed-by: Anand Jain <anand.jain@oracle.com>
Signed-off-by: David Sterba <dsterba@suse.com>
fs/btrfs/ctree.c

index 9569e75db9604e34980e5a2426b943acf422704e..94c4ed1b99d0f3a3aeac9bfa60bea0877f63fe28 100644 (file)
@@ -2245,7 +2245,6 @@ int btrfs_search_old_slot(struct btrfs_root *root, const struct btrfs_key *key,
        struct extent_buffer *b;
        int slot;
        int ret;
-       int err;
        int level;
        int lowest_unlock = 1;
        u8 lowest_level = 0;
@@ -2270,6 +2269,7 @@ again:
 
        while (b) {
                int dec = 0;
+               int ret2;
 
                level = btrfs_header_level(b);
                p->nodes[level] = b;
@@ -2305,11 +2305,11 @@ again:
                        goto done;
                }
 
-               err = read_block_for_search(root, p, &b, slot, key);
-               if (err == -EAGAIN && !p->nowait)
+               ret2 = read_block_for_search(root, p, &b, slot, key);
+               if (ret2 == -EAGAIN && !p->nowait)
                        goto again;
-               if (err) {
-                       ret = err;
+               if (ret2) {
+                       ret = ret2;
                        goto done;
                }