btrfs: simplify return values in setup_nodes_for_search

The function is needlessly convoluted. Fix that by:

* removing redundant sret variable definition in both if arms

* replace the again/done labels with direct return statements, the
  function is short enough and doesn't do anything special upon exit

* remove BUG_ON on split_node returning a positive number - it can't
  happen as split_node returns either 0 or a negative error code.

Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
index 60135f6e64410aa67992f4980a96f29d14a5ff49..e5a0941c4bdece96ecd1d89e4d89c0c125c2e82a 100644 (file)
--- a/fs/btrfs/ctree.c
+++ b/fs/btrfs/ctree.c
@@ -2387,56 +2387,42 @@ setup_nodes_for_search(struct btrfs_trans_handle *trans,
                       int *write_lock_level)
 {
        struct btrfs_fs_info *fs_info = root->fs_info;
-       int ret;
+       int ret = 0;
 
        if ((p->search_for_split || ins_len > 0) && btrfs_header_nritems(b) >=
            BTRFS_NODEPTRS_PER_BLOCK(fs_info) - 3) {
-               int sret;
 
                if (*write_lock_level < level + 1) {
                        *write_lock_level = level + 1;
                        btrfs_release_path(p);
-                       goto again;
+                       return -EAGAIN;
                }
 
                reada_for_balance(p, level);
-               sret = split_node(trans, root, p, level);
+               ret = split_node(trans, root, p, level);
 
-               BUG_ON(sret > 0);
-               if (sret) {
-                       ret = sret;
-                       goto done;
-               }
                b = p->nodes[level];
        } else if (ins_len < 0 && btrfs_header_nritems(b) <
                   BTRFS_NODEPTRS_PER_BLOCK(fs_info) / 2) {
-               int sret;
 
                if (*write_lock_level < level + 1) {
                        *write_lock_level = level + 1;
                        btrfs_release_path(p);
-                       goto again;
+                       return -EAGAIN;
                }
 
                reada_for_balance(p, level);
-               sret = balance_level(trans, root, p, level);
+               ret = balance_level(trans, root, p, level);
+               if (ret)
+                       return ret;
 
-               if (sret) {
-                       ret = sret;
-                       goto done;
-               }
                b = p->nodes[level];
                if (!b) {
                        btrfs_release_path(p);
-                       goto again;
+                       return -EAGAIN;
                }
                BUG_ON(btrfs_header_nritems(b) == 1);
        }
-       return 0;
-
-again:
-       ret = -EAGAIN;
-done:
        return ret;
 }