Commit cfbb825c authored by David Sterba's avatar David Sterba
Browse files

btrfs: add incompat for raid1 with 3, 4 copies 



The new raid1c3 and raid1c4 profiles are backward incompatible and the
name shall be 'raid1c34', the status can be found in the global
supported features in /sys/fs/btrfs/features or in the per-filesystem
directory.

Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 8d6fac00

fs/btrfs/ctree.h

+2 −1
Original line number Diff line number Diff line
@@ -292,7 +292,8 @@ struct btrfs_super_block { 
	 BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF |		\

	 BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA |	\

	 BTRFS_FEATURE_INCOMPAT_NO_HOLES	|	\

	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID)

	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID	|	\

	 BTRFS_FEATURE_INCOMPAT_RAID1C34)



#define BTRFS_FEATURE_INCOMPAT_SAFE_SET			\

	(BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF)

fs/btrfs/sysfs.c

+2 −0
Original line number Diff line number Diff line
@@ -259,6 +259,7 @@ BTRFS_FEAT_ATTR_INCOMPAT(skinny_metadata, SKINNY_METADATA); 
BTRFS_FEAT_ATTR_INCOMPAT(no_holes, NO_HOLES);

BTRFS_FEAT_ATTR_INCOMPAT(metadata_uuid, METADATA_UUID);

BTRFS_FEAT_ATTR_COMPAT_RO(free_space_tree, FREE_SPACE_TREE);

BTRFS_FEAT_ATTR_INCOMPAT(raid1c34, RAID1C34);



static struct attribute *btrfs_supported_feature_attrs[] = {

	BTRFS_FEAT_ATTR_PTR(mixed_backref),
@@ -273,6 +274,7 @@ static struct attribute *btrfs_supported_feature_attrs[] = { 
	BTRFS_FEAT_ATTR_PTR(no_holes),

	BTRFS_FEAT_ATTR_PTR(metadata_uuid),

	BTRFS_FEAT_ATTR_PTR(free_space_tree),

	BTRFS_FEAT_ATTR_PTR(raid1c34),

	NULL

};

fs/btrfs/volumes.c

+9 −0
Original line number Diff line number Diff line
@@ -4717,6 +4717,14 @@ static void check_raid56_incompat_flag(struct btrfs_fs_info *info, u64 type) 
	btrfs_set_fs_incompat(info, RAID56);

}



static void check_raid1c34_incompat_flag(struct btrfs_fs_info *info, u64 type)

{

	if (!(type & (BTRFS_BLOCK_GROUP_RAID1C3 | BTRFS_BLOCK_GROUP_RAID1C4)))

		return;



	btrfs_set_fs_incompat(info, RAID1C34);

}



static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans,

			       u64 start, u64 type)

{
@@ -4983,6 +4991,7 @@ static int __btrfs_alloc_chunk(struct btrfs_trans_handle *trans, 


	free_extent_map(em);

	check_raid56_incompat_flag(info, type);

	check_raid1c34_incompat_flag(info, type);



	kfree(devices_info);

	return 0;

include/uapi/linux/btrfs.h

+1 −0
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ struct btrfs_ioctl_fs_info_args { 
#define BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA	(1ULL << 8)

#define BTRFS_FEATURE_INCOMPAT_NO_HOLES		(1ULL << 9)

#define BTRFS_FEATURE_INCOMPAT_METADATA_UUID	(1ULL << 10)

#define BTRFS_FEATURE_INCOMPAT_RAID1C34		(1ULL << 11)



struct btrfs_ioctl_feature_flags {

	__u64 compat_flags;

CRA Git | Maintained and supported by SUSTech CRA and CCSE