diff options
| author | Anand Jain <anand.jain@oracle.com> | 2023-07-31 13:16:33 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2023-08-21 14:54:48 +0200 |
| commit | 319baafcef2e075f515fce6a89e833f7aeae8484 (patch) | |
| tree | b894588404de4d8feb49a711d54a6f1e14c94385 /fs/btrfs | |
| parent | btrfs: add a helper to read the superblock metadata_uuid (diff) | |
| download | linux-319baafcef2e075f515fce6a89e833f7aeae8484.tar.xz linux-319baafcef2e075f515fce6a89e833f7aeae8484.zip | |
btrfs: simplify memcpy either of metadata_uuid or fsid
There is a helper which provides either metadata_uuid or fsid as per
METADATA_UUID flag. So use it.
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: Guilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: Anand Jain <anand.jain@oracle.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs')
| -rw-r--r-- | fs/btrfs/volumes.c | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index 2669206e6f15..733842136163 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -841,15 +841,8 @@ static noinline struct btrfs_device *device_list_add(const char *path, found_transid > fs_devices->latest_generation) { memcpy(fs_devices->fsid, disk_super->fsid, BTRFS_FSID_SIZE); - - if (has_metadata_uuid) - memcpy(fs_devices->metadata_uuid, - disk_super->metadata_uuid, - BTRFS_FSID_SIZE); - else - memcpy(fs_devices->metadata_uuid, - disk_super->fsid, BTRFS_FSID_SIZE); - + memcpy(fs_devices->metadata_uuid, + btrfs_sb_fsid_ptr(disk_super), BTRFS_FSID_SIZE); fs_devices->fsid_change = false; } } |