public-mirrors/linux
1
0
Fork 0
mirror of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2025-08-05 16:54:27 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

btrfs: use btrfs_for_each_slot in process_all_new_xattrs

Browse source 
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:
Gabriel Niebler 2022-03-09 14:50:47 +01:00 • committed by David Sterba
parent 649b96355d
commit 69e4317759
1 changed files with 8 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
fs/btrfs/send.c
View file

@ -4815,13 +4815,12 @@ out:
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)
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;
} }