marko10_000
/
btrfs-progs
forked from Mirrors/btrfs-progs
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

btrfs-progs: btrfstune: use on-stack path buffer in change_devices_uuid 

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>
master
David Sterba 2016-11-03 00:37:51 +01:00
parent ac2a089560
commit 8c4e5fbe89
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
btrfstune.c
View File

@ -200,28 +200,26 @@ static int change_device_uuid(struct btrfs_root *root, struct extent_buffer *eb,
static int change_devices_uuid(struct btrfs_fs_info *fs_info)
{
struct btrfs_root *root = fs_info->chunk_root;
struct btrfs_path *path;
struct btrfs_path path;
struct btrfs_key key = {0, 0, 0};
int ret = 0;
path = btrfs_alloc_path();
if (!path)
return -ENOMEM;
btrfs_init_path(&path);
/* No transaction again */
ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
if (ret < 0)
goto out;
while (1) {
btrfs_item_key_to_cpu(path->nodes[0], &key, path->slots[0]);
btrfs_item_key_to_cpu(path.nodes[0], &key, path.slots[0]);
if (key.type != BTRFS_DEV_ITEM_KEY ||
key.objectid != BTRFS_DEV_ITEMS_OBJECTID)
goto next;
ret = change_device_uuid(root, path->nodes[0], path->slots[0]);
ret = change_device_uuid(root, path.nodes[0], path.slots[0]);
if (ret < 0)
goto out;
next:
ret = btrfs_next_item(root, path);
ret = btrfs_next_item(root, &path);
if (ret < 0)
goto out;
if (ret > 0) {
@ -230,7 +228,7 @@ next:
}
}
out:
btrfs_free_path(path);
btrfs_release_path(&path);
return ret;
}