Commit 69e43177 authored by Gabriel Niebler's avatar Gabriel Niebler Committed by David Sterba

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: 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 649b9635
...@@ -4815,13 +4815,12 @@ static int process_changed_xattr(struct send_ctx *sctx) ...@@ -4815,13 +4815,12 @@ static int process_changed_xattr(struct send_ctx *sctx)
static int process_all_new_xattrs(struct send_ctx *sctx) 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_root *root;
struct btrfs_path *path; struct btrfs_path *path;
struct btrfs_key key; struct btrfs_key key;
struct btrfs_key found_key; struct btrfs_key found_key;
struct extent_buffer *eb;
int slot;
path = alloc_path_for_send(); path = alloc_path_for_send();
if (!path) if (!path)
...@@ -4832,39 +4831,21 @@ static int process_all_new_xattrs(struct send_ctx *sctx) ...@@ -4832,39 +4831,21 @@ static int process_all_new_xattrs(struct send_ctx *sctx)
key.objectid = sctx->cmp_key->objectid; key.objectid = sctx->cmp_key->objectid;
key.type = BTRFS_XATTR_ITEM_KEY; key.type = BTRFS_XATTR_ITEM_KEY;
key.offset = 0; key.offset = 0;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0); btrfs_for_each_slot(root, &key, &found_key, path, iter_ret) {
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);
if (found_key.objectid != key.objectid || if (found_key.objectid != key.objectid ||
found_key.type != key.type) { found_key.type != key.type) {
ret = 0; ret = 0;
goto out; break;
} }
ret = iterate_dir_item(root, path, __process_new_xattr, sctx); ret = iterate_dir_item(root, path, __process_new_xattr, sctx);
if (ret < 0) if (ret < 0)
goto out; break;
path->slots[0]++;
} }
/* Catch error found during iteration */
if (iter_ret < 0)
ret = iter_ret;
out:
btrfs_free_path(path); btrfs_free_path(path);
return ret; return ret;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment