Commit 18f80f1f authored by Gabriel Niebler's avatar Gabriel Niebler Committed by David Sterba
Browse files

btrfs: use btrfs_for_each_slot in can_rmdir 



This function can be simplified by refactoring to use the new iterator
macro.  No functional changes.

Signed-off-by: default avatarMarcos Paulo de Souza <mpdesouza@suse.com>
Signed-off-by: default avatarGabriel Niebler <gniebler@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 6dcee260

fs/btrfs/send.c

+6 −17
Original line number Diff line number Diff line
@@ -2915,6 +2915,7 @@ static int can_rmdir(struct send_ctx *sctx, u64 dir, u64 dir_gen, 
		     u64 send_progress)

{

	int ret = 0;

	int iter_ret = 0;

	struct btrfs_root *root = sctx->parent_root;

	struct btrfs_path *path;

	struct btrfs_key key;
@@ -2941,23 +2942,9 @@ static int can_rmdir(struct send_ctx *sctx, u64 dir, u64 dir_gen, 
	if (odi)

		key.offset = odi->last_dir_index_offset;



	ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);

	if (ret < 0)

		goto out;



	while (1) {

	btrfs_for_each_slot(root, &key, &found_key, path, iter_ret) {

		struct waiting_dir_move *dm;



		if (path->slots[0] >= btrfs_header_nritems(path->nodes[0])) {

			ret = btrfs_next_leaf(root, path);

			if (ret < 0)

				goto out;

			else if (ret > 0)

				break;

			continue;

		}

		btrfs_item_key_to_cpu(path->nodes[0], &found_key,

				      path->slots[0]);

		if (found_key.objectid != key.objectid ||

		    found_key.type != key.type)

			break;
@@ -2992,8 +2979,10 @@ static int can_rmdir(struct send_ctx *sctx, u64 dir, u64 dir_gen, 
			ret = 0;

			goto out;

		}



		path->slots[0]++;

	}

	if (iter_ret < 0) {

		ret = iter_ret;

		goto out;

	}

	free_orphan_dir_info(sctx, odi);