btrfs: use btrfs_for_each_slot in did_create_dir

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 7d16429..fc26094 100644 (file)
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -2675,61 +2675,43 @@ out:
 static int did_create_dir(struct send_ctx *sctx, u64 dir)
 {
        int ret = 0;
+       int iter_ret = 0;
        struct btrfs_path *path = NULL;
        struct btrfs_key key;
        struct btrfs_key found_key;
        struct btrfs_key di_key;
-       struct extent_buffer *eb;
        struct btrfs_dir_item *di;
-       int slot;
 
        path = alloc_path_for_send();
-       if (!path) {
-               ret = -ENOMEM;
-               goto out;
-       }
+       if (!path)
+               return -ENOMEM;
 
        key.objectid = dir;
        key.type = BTRFS_DIR_INDEX_KEY;
        key.offset = 0;
-       ret = btrfs_search_slot(NULL, sctx->send_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(sctx->send_root, path);
-                       if (ret < 0) {
-                               goto out;
-                       } else if (ret > 0) {
-                               ret = 0;
-                               break;
-                       }
-                       continue;
-               }
+       btrfs_for_each_slot(sctx->send_root, &key, &found_key, path, iter_ret) {
+               struct extent_buffer *eb = path->nodes[0];
 
-               btrfs_item_key_to_cpu(eb, &found_key, slot);
                if (found_key.objectid != key.objectid ||
                    found_key.type != key.type) {
                        ret = 0;
-                       goto out;
+                       break;
                }
 
-               di = btrfs_item_ptr(eb, slot, struct btrfs_dir_item);
+               di = btrfs_item_ptr(eb, path->slots[0], struct btrfs_dir_item);
                btrfs_dir_item_key_to_cpu(eb, di, &di_key);
 
                if (di_key.type != BTRFS_ROOT_ITEM_KEY &&
                    di_key.objectid < sctx->send_progress) {
                        ret = 1;
-                       goto out;
+                       break;
                }
-
-               path->slots[0]++;
        }
+       /* Catch error found during iteration */
+       if (iter_ret < 0)
+               ret = iter_ret;
 
-out:
        btrfs_free_path(path);
        return ret;
 }