btrfs-progs: check: use on-stack path buffer in check_fs_roots_v2
authorDavid Sterba <dsterba@suse.com>
Wed, 2 Nov 2016 23:37:51 +0000 (00:37 +0100)
committerDavid Sterba <dsterba@suse.com>
Wed, 14 Dec 2016 14:06:34 +0000 (15:06 +0100)
We don't need to conserve stack space too much unlike kernel, also
remove one error condition.

Signed-off-by: David Sterba <dsterba@suse.com>
cmds-check.c

index fd6bbd2..30eabb2 100644 (file)
@@ -5131,7 +5131,7 @@ static int check_fs_roots_v2(struct btrfs_fs_info *fs_info)
 {
        struct btrfs_root *tree_root = fs_info->tree_root;
        struct btrfs_root *cur_root = NULL;
-       struct btrfs_path *path;
+       struct btrfs_path path;
        struct btrfs_key key;
        struct extent_buffer *node;
        unsigned int ext_ref;
@@ -5141,15 +5141,12 @@ static int check_fs_roots_v2(struct btrfs_fs_info *fs_info)
 
        ext_ref = btrfs_fs_incompat(fs_info, EXTENDED_IREF);
 
-       path = btrfs_alloc_path();
-       if (!path)
-               return -ENOMEM;
-
+       btrfs_init_path(&path);
        key.objectid = BTRFS_FS_TREE_OBJECTID;
        key.offset = 0;
        key.type = BTRFS_ROOT_ITEM_KEY;
 
-       ret = btrfs_search_slot(NULL, tree_root, &key, path, 0, 0);
+       ret = btrfs_search_slot(NULL, tree_root, &key, &path, 0, 0);
        if (ret < 0) {
                err = ret;
                goto out;
@@ -5159,8 +5156,8 @@ static int check_fs_roots_v2(struct btrfs_fs_info *fs_info)
        }
 
        while (1) {
-               node = path->nodes[0];
-               slot = path->slots[0];
+               node = path.nodes[0];
+               slot = path.slots[0];
                btrfs_item_key_to_cpu(node, &key, slot);
                if (key.objectid > BTRFS_LAST_FREE_OBJECTID)
                        goto out;
@@ -5192,7 +5189,7 @@ static int check_fs_roots_v2(struct btrfs_fs_info *fs_info)
                        err |= ret;
                }
 next:
-               ret = btrfs_next_item(tree_root, path);
+               ret = btrfs_next_item(tree_root, &path);
                if (ret > 0)
                        goto out;
                if (ret < 0) {
@@ -5202,7 +5199,7 @@ next:
        }
 
 out:
-       btrfs_free_path(path);
+       btrfs_release_path(&path);
        return err;
 }