Commit 95109cae authored by Anand Jain's avatar Anand Jain Committed by sanglipeng
Browse files

btrfs: add a helper to read the superblock metadata_uuid 

stable inclusion
from stable-v5.10.197
commit ab90a3930d39579f94b5b22eed7337d81450f162
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I96Q8P

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=ab90a3930d39579f94b5b22eed7337d81450f162



--------------------------------

[ Upstream commit 4844c366 ]

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: 6bfe3959 ("btrfs: compare the correct fsid/metadata_uuid in btrfs_validate_super")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent 43bfc458

fs/btrfs/volumes.c

+8 −0
Original line number Diff line number Diff line
@@ -718,6 +718,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. Such

fs/btrfs/volumes.h

+1 −0
Original line number Diff line number Diff line
@@ -581,5 +581,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