btrfs: use btrfs_for_each_slot in process_all_new_xattrs
This function can be simplified by refactoring to use the new iterator macro. No functional changes. Signed-off-by: Marcos Paulo de Souza <mpdesouza@suse.com> Signed-off-by: Gabriel Niebler <gniebler@suse.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Родитель
649b96355d
Коммит
69e4317759
|
@ -4815,13 +4815,12 @@ out:
|
|||
|
||||
static int process_all_new_xattrs(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;
|
||||
|
||||
path = alloc_path_for_send();
|
||||
if (!path)
|
||||
|
@ -4832,39 +4831,21 @@ static int process_all_new_xattrs(struct send_ctx *sctx)
|
|||
key.objectid = sctx->cmp_key->objectid;
|
||||
key.type = BTRFS_XATTR_ITEM_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 = iterate_dir_item(root, path, __process_new_xattr, sctx);
|
||||
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;
|
||||
}
|
||||
|
|
Загрузка…
Ссылка в новой задаче