mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 02:19:51 +00:00
btrfs: use btrfs_for_each_slot in btrfs_unlink_all_paths
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:
parent
9930e9d4ad
commit
3d64f060a7
1 changed files with 13 additions and 23 deletions
|
@ -6110,8 +6110,11 @@ static int btrfs_unlink_all_paths(struct send_ctx *sctx)
|
|||
{
|
||||
LIST_HEAD(deleted_refs);
|
||||
struct btrfs_path *path;
|
||||
struct btrfs_root *root = sctx->parent_root;
|
||||
struct btrfs_key key;
|
||||
struct btrfs_key found_key;
|
||||
struct parent_paths_ctx ctx;
|
||||
int iter_ret = 0;
|
||||
int ret;
|
||||
|
||||
path = alloc_path_for_send();
|
||||
|
@ -6121,39 +6124,26 @@ static int btrfs_unlink_all_paths(struct send_ctx *sctx)
|
|||
key.objectid = sctx->cur_ino;
|
||||
key.type = BTRFS_INODE_REF_KEY;
|
||||
key.offset = 0;
|
||||
ret = btrfs_search_slot(NULL, sctx->parent_root, &key, path, 0, 0);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
ctx.refs = &deleted_refs;
|
||||
ctx.sctx = sctx;
|
||||
|
||||
while (true) {
|
||||
struct extent_buffer *eb = path->nodes[0];
|
||||
int slot = path->slots[0];
|
||||
|
||||
if (slot >= btrfs_header_nritems(eb)) {
|
||||
ret = btrfs_next_leaf(sctx->parent_root, path);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
else if (ret > 0)
|
||||
btrfs_for_each_slot(root, &key, &found_key, path, iter_ret) {
|
||||
if (found_key.objectid != key.objectid)
|
||||
break;
|
||||
continue;
|
||||
}
|
||||
|
||||
btrfs_item_key_to_cpu(eb, &key, slot);
|
||||
if (key.objectid != sctx->cur_ino)
|
||||
break;
|
||||
if (key.type != BTRFS_INODE_REF_KEY &&
|
||||
key.type != BTRFS_INODE_EXTREF_KEY)
|
||||
if (found_key.type != key.type &&
|
||||
found_key.type != BTRFS_INODE_EXTREF_KEY)
|
||||
break;
|
||||
|
||||
ret = iterate_inode_ref(sctx->parent_root, path, &key, 1,
|
||||
ret = iterate_inode_ref(root, path, &found_key, 1,
|
||||
record_parent_ref, &ctx);
|
||||
if (ret < 0)
|
||||
goto out;
|
||||
|
||||
path->slots[0]++;
|
||||
}
|
||||
/* Catch error found during iteration */
|
||||
if (iter_ret < 0) {
|
||||
ret = iter_ret;
|
||||
goto out;
|
||||
}
|
||||
|
||||
while (!list_empty(&deleted_refs)) {
|
||||
|
|
Loading…
Reference in a new issue