From 24852b646cd20c1bd34d8206cb733118b2ba5f19 Mon Sep 17 00:00:00 2001 From: Nikolay Borisov Date: Thu, 11 Oct 2018 18:04:04 +0300 Subject: [PATCH] btrfs-progs: Directly pass root to change_devices_uuid This function currently takes an fs_info only to reference the chunk root. Just pass the root directly. No functional changes. Signed-off-by: Nikolay Borisov Signed-off-by: David Sterba --- btrfstune.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/btrfstune.c b/btrfstune.c index a7debe91..d829dcf9 100644 --- a/btrfstune.c +++ b/btrfstune.c @@ -309,9 +309,8 @@ static int change_device_uuid(struct extent_buffer *eb, int slot, return ret; } -static int change_devices_uuid(struct btrfs_fs_info *fs_info, uuid_t new_fsid) +static int change_devices_uuid(struct btrfs_root *root, uuid_t new_fsid) { - struct btrfs_root *root = fs_info->chunk_root; struct btrfs_path path; struct btrfs_key key = {0, 0, 0}; int ret = 0; @@ -438,7 +437,7 @@ static int change_uuid(struct btrfs_fs_info *fs_info, const char *new_fsid_str) /* Then devices */ printf("Change fsid on devices\n"); - ret = change_devices_uuid(fs_info, new_fsid); + ret = change_devices_uuid(fs_info->chunk_root, new_fsid); if (ret < 0) { error("failed to change UUID of devices: %d", ret); goto out;