btrfs: use btrfs_for_each_slot in process_all_refs

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>

diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index 31aa303..643d23c 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -4511,13 +4511,12 @@ out:
 static int process_all_refs(struct send_ctx *sctx,
                            enum btrfs_compare_tree_result cmd)
 {
-       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;
        iterate_inode_ref_t cb;
        int pending_move = 0;
 
@@ -4541,24 +4540,7 @@ static int process_all_refs(struct send_ctx *sctx,
        key.objectid = sctx->cmp_key->objectid;
        key.type = BTRFS_INODE_REF_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)
-                               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 != BTRFS_INODE_REF_KEY &&
                     found_key.type != BTRFS_INODE_EXTREF_KEY))
@@ -4567,8 +4549,11 @@ static int process_all_refs(struct send_ctx *sctx,
                ret = iterate_inode_ref(root, path, &found_key, 0, cb, sctx);
                if (ret < 0)
                        goto out;
-
-               path->slots[0]++;
+       }
+       /* Catch error found during iteration */
+       if (iter_ret < 0) {
+               ret = iter_ret;
+               goto out;
        }
        btrfs_release_path(path);