btrfs: rename err to ret2 in btrfs_search_slot()

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>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index d5798360c0f212d673b58f07d4f39320d178cfa9..9569e75db9604e34980e5a2426b943acf422704e 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -1992,7 +1992,6 @@ int btrfs_search_slot(struct btrfs_trans_handle *trans, struct btrfs_root *root,
        struct extent_buffer *b;
        int slot;
        int ret;
-       int err;
        int level;
        int lowest_unlock = 1;
        /* everything at write_lock_level or lower must be write locked */
@@ -2063,6 +2062,7 @@ again:
 
        while (b) {
                int dec = 0;
+               int ret2;
 
                level = btrfs_header_level(b);
 
@@ -2091,16 +2091,15 @@ again:
                        }
 
                        if (last_level)
-                               err = btrfs_cow_block(trans, root, b, NULL, 0,
-                                                     &b,
-                                                     BTRFS_NESTING_COW);
+                               ret2 = btrfs_cow_block(trans, root, b, NULL, 0,
+                                                      &b, BTRFS_NESTING_COW);
                        else
-                               err = btrfs_cow_block(trans, root, b,
-                                                     p->nodes[level + 1],
-                                                     p->slots[level + 1], &b,
-                                                     BTRFS_NESTING_COW);
-                       if (err) {
-                               ret = err;
+                               ret2 = btrfs_cow_block(trans, root, b,
+                                                      p->nodes[level + 1],
+                                                      p->slots[level + 1], &b,
+                                                      BTRFS_NESTING_COW);
+                       if (ret2) {
+                               ret = ret2;
                                goto done;
                        }
                }
@@ -2148,12 +2147,12 @@ cow_done:
                        slot--;
                }
                p->slots[level] = slot;
-               err = setup_nodes_for_search(trans, root, p, b, level, ins_len,
-                                            &write_lock_level);
-               if (err == -EAGAIN)
+               ret2 = setup_nodes_for_search(trans, root, p, b, level, ins_len,
+                                             &write_lock_level);
+               if (ret2 == -EAGAIN)
                        goto again;
-               if (err) {
-                       ret = err;
+               if (ret2) {
+                       ret = ret2;
                        goto done;
                }
                b = p->nodes[level];
@@ -2179,11 +2178,11 @@ cow_done:
                        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;
                }