RepoMirrors/btrfs-progs
1
0
Fork 0
mirror of https://github.com/kdave/btrfs-progs synced 2024-12-30 18:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

btrfs-progs: restore: use on-stack path buffer in do_list_roots

Browse Source 
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>
This commit is contained in:
David Sterba 2016-11-03 00:37:51 +01:00
parent 61b72497bb
commit 6dfe365b4b
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
cmds-restore.c
View File

@ -1171,7 +1171,7 @@ static int do_list_roots(struct btrfs_root *root)
struct btrfs_key key;
struct btrfs_key found_key;
struct btrfs_disk_key disk_key;
struct btrfs_path *path;
struct btrfs_path path;
struct extent_buffer *leaf;
struct btrfs_root_item ri;
unsigned long offset;
@ -1179,38 +1179,33 @@ static int do_list_roots(struct btrfs_root *root)
int ret;
root = root->fs_info->tree_root;
path = btrfs_alloc_path();
if (!path) {
fprintf(stderr, "Failed to alloc path\n");
return -ENOMEM;
}
btrfs_init_path(&path);
key.offset = 0;
key.objectid = 0;
key.type = BTRFS_ROOT_ITEM_KEY;
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
if (ret < 0) {
fprintf(stderr, "Failed to do search %d\n", ret);
btrfs_free_path(path);
btrfs_release_path(&path);
return -1;
}
leaf = path->nodes[0];
leaf = path.nodes[0];
while (1) {
slot = path->slots[0];
slot = path.slots[0];
if (slot >= btrfs_header_nritems(leaf)) {
ret = btrfs_next_leaf(root, path);
ret = btrfs_next_leaf(root, &path);
if (ret)
break;
leaf = path->nodes[0];
slot = path->slots[0];
leaf = path.nodes[0];
slot = path.slots[0];
}
btrfs_item_key(leaf, &disk_key, slot);
btrfs_disk_key_to_cpu(&found_key, &disk_key);
if (found_key.type != BTRFS_ROOT_ITEM_KEY) {
path->slots[0]++;
path.slots[0]++;
continue;
}
@ -1220,9 +1215,9 @@ static int do_list_roots(struct btrfs_root *root)
btrfs_print_key(&disk_key);
printf(" %Lu level %d\n", btrfs_root_bytenr(&ri),
btrfs_root_level(&ri));
path->slots[0]++;
path.slots[0]++;
}
btrfs_free_path(path);
btrfs_release_path(&path);
return 0;
}