Skip to content

Commit

Permalink
btrfs: simplify return values in setup_nodes_for_search
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Nikolay Borisov authored and David Sterba committed Dec 8, 2020
1 parent d5286a9 commit 95b982d
Showing 1 changed file with 8 additions and 22 deletions.
30 changes: 8 additions & 22 deletions fs/btrfs/ctree.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down

0 comments on commit 95b982d

Please sign in to comment.