Commit f624d976 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: ctree: Reduce one indent level for btrfs_search_slot() 



In btrfs_search_slot(), we something like:

	if (level != 0) {
		/* Do search inside tree nodes*/
	} else {
		/* Do search inside tree leaves */
		goto done;
	}

This caused extra indent for tree node search code.  Change it to
something like:

	if (level == 0) {
		/* Do search inside tree leaves */
		goto done'
	}
	/* Do search inside tree nodes */

So we have more space to maneuver our code, this is especially useful as
the tree nodes search code is more complex than the leaves search code.

Reviewed-by: default avatarAnand Jain <anand.jain@oracle.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 71bf92a9

fs/btrfs/ctree.c

+64 −67
Original line number Diff line number Diff line
@@ -2785,6 +2785,8 @@ again: 
	}



	while (b) {

		int dec = 0;



		level = btrfs_header_level(b);



		/*
@@ -2861,15 +2863,38 @@ cow_done: 
		if (ret < 0)

			goto done;



		if (level != 0) {

			int dec = 0;

		if (level == 0) {

			p->slots[level] = slot;

			if (ins_len > 0 &&

			    btrfs_leaf_free_space(b) < ins_len) {

				if (write_lock_level < 1) {

					write_lock_level = 1;

					btrfs_release_path(p);

					goto again;

				}



				btrfs_set_path_blocking(p);

				err = split_leaf(trans, root, key,

						 p, ins_len, ret == 0);



				BUG_ON(err > 0);

				if (err) {

					ret = err;

					goto done;

				}

			}

			if (!p->search_for_split)

				unlock_up(p, level, lowest_unlock,

					  min_write_lock_level, NULL);

			goto done;

		}

		if (ret && slot > 0) {

			dec = 1;

				slot -= 1;

			slot--;

		}

		p->slots[level] = slot;

			err = setup_nodes_for_search(trans, root, p, b, level,

					     ins_len, &write_lock_level);

		err = setup_nodes_for_search(trans, root, p, b, level, ins_len,

					     &write_lock_level);

		if (err == -EAGAIN)

			goto again;

		if (err) {
@@ -2880,20 +2905,18 @@ cow_done: 
		slot = p->slots[level];



		/*

			 * slot 0 is special, if we change the key

			 * we have to update the parent pointer

			 * which means we must have a write lock

			 * on the parent

		 * Slot 0 is special, if we change the key we have to update

		 * the parent pointer which means we must have a write lock on

		 * the parent

		 */

			if (slot == 0 && ins_len &&

			    write_lock_level < level + 1) {

		if (slot == 0 && ins_len && write_lock_level < level + 1) {

			write_lock_level = level + 1;

			btrfs_release_path(p);

			goto again;

		}



			unlock_up(p, level, lowest_unlock,

				  min_write_lock_level, &write_lock_level);

		unlock_up(p, level, lowest_unlock, min_write_lock_level,

			  &write_lock_level);



		if (level == lowest_level) {

			if (dec)
@@ -2901,8 +2924,7 @@ cow_done: 
			goto done;

		}



			err = read_block_for_search(root, p, &b, level,

						    slot, key);

		err = read_block_for_search(root, p, &b, level, slot, key);

		if (err == -EAGAIN)

			goto again;

		if (err) {
@@ -2927,31 +2949,6 @@ cow_done: 
			}

			p->nodes[level] = b;

		}

		} else {

			p->slots[level] = slot;

			if (ins_len > 0 &&

			    btrfs_leaf_free_space(b) < ins_len) {

				if (write_lock_level < 1) {

					write_lock_level = 1;

					btrfs_release_path(p);

					goto again;

				}



				btrfs_set_path_blocking(p);

				err = split_leaf(trans, root, key,

						 p, ins_len, ret == 0);



				BUG_ON(err > 0);

				if (err) {

					ret = err;

					goto done;

				}

			}

			if (!p->search_for_split)

				unlock_up(p, level, lowest_unlock,

					  min_write_lock_level, NULL);

			goto done;

		}

	}

	ret = 1;

done:

CRA Git | Maintained and supported by SUSTech CRA and CCSE