Commit 9930e9d4 authored by Gabriel Niebler's avatar Gabriel Niebler Committed by David Sterba
Browse files

btrfs: use btrfs_for_each_slot in process_all_extents 



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 69e43177

fs/btrfs/send.c

+8 −29
Original line number Diff line number Diff line
@@ -5891,13 +5891,12 @@ static int process_extent(struct send_ctx *sctx, 


static int process_all_extents(struct send_ctx *sctx)

{

	int ret;

	int ret = 0;

	int iter_ret = 0;

	struct btrfs_root *root;

	struct btrfs_path *path;

	struct btrfs_key key;

	struct btrfs_key found_key;

	struct extent_buffer *eb;

	int slot;



	root = sctx->send_root;

	path = alloc_path_for_send();
@@ -5907,41 +5906,21 @@ static int process_all_extents(struct send_ctx *sctx) 
	key.objectid = sctx->cmp_key->objectid;

	key.type = BTRFS_EXTENT_DATA_KEY;

	key.offset = 0;

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

	if (ret < 0)

		goto out;



	while (1) {

		eb = path->nodes[0];

		slot = path->slots[0];



		if (slot >= btrfs_header_nritems(eb)) {

			ret = btrfs_next_leaf(root, path);

			if (ret < 0) {

				goto out;

			} else if (ret > 0) {

				ret = 0;

				break;

			}

			continue;

		}



		btrfs_item_key_to_cpu(eb, &found_key, slot);



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

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

		    found_key.type != key.type) {

			ret = 0;

			goto out;

			break;

		}



		ret = process_extent(sctx, path, &found_key);

		if (ret < 0)

			goto out;



		path->slots[0]++;

			break;

	}

	/* Catch error found during iteration */

	if (iter_ret < 0)

		ret = iter_ret;



out:

	btrfs_free_path(path);

	return ret;

}