Commit 95b982de authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

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: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarNikolay Borisov <nborisov@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent d5286a92

fs/btrfs/ctree.c

+8 −22
Original line number Diff line number Diff line
@@ -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;

}