Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b61aad18 authored by Anand Jain's avatar Anand Jain Committed by Greg Kroah-Hartman
Browse files

btrfs: add a helper to read the superblock metadata_uuid 



[ Upstream commit 4844c3664a72d36cc79752cb651c78860b14c240 ]

In some cases, we need to read the FSID from the superblock when the
metadata_uuid is not set, and otherwise, read the metadata_uuid. So,
add a helper.

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Tested-by: default avatarGuilherme G. Piccoli <gpiccoli@igalia.com>
Signed-off-by: default avatarAnand Jain <anand.jain@oracle.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
Stable-dep-of: 6bfe3959b0e7 ("btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent bd0fe548

fs/btrfs/volumes.c

+8 −0
Original line number Diff line number Diff line
@@ -895,6 +895,14 @@ static int btrfs_open_one_device(struct btrfs_fs_devices *fs_devices, 
	return -EINVAL;

}



u8 *btrfs_sb_fsid_ptr(struct btrfs_super_block *sb)

{

	bool has_metadata_uuid = (btrfs_super_incompat_flags(sb) &

				  BTRFS_FEATURE_INCOMPAT_METADATA_UUID);



	return has_metadata_uuid ? sb->metadata_uuid : sb->fsid;

}



/*

 * Handle scanned device having its CHANGING_FSID_V2 flag set and the fs_devices

 * being created with a disk that has already completed its fsid change.

fs/btrfs/volumes.h

+1 −0
Original line number Diff line number Diff line
@@ -582,5 +582,6 @@ const char *btrfs_bg_type_to_raid_name(u64 flags); 
int btrfs_verify_dev_extents(struct btrfs_fs_info *fs_info);



bool btrfs_pinned_by_swapfile(struct btrfs_fs_info *fs_info, void *ptr);

u8 *btrfs_sb_fsid_ptr(struct btrfs_super_block *sb);



#endif