Commit 2c7d2a23 authored by Josef Bacik's avatar Josef Bacik Committed by David Sterba
Browse files

btrfs: add definition for EXTENT_TREE_V2 



This adds the initial definition of the EXTENT_TREE_V2 incompat feature
flag.  This also hides the support behind CONFIG_BTRFS_DEBUG.

THIS IS A IN DEVELOPMENT FORMAT CHANGE, DO NOT USE UNLESS YOU ARE A
DEVELOPER OR A TESTER.

The format is in flux and will be added in stages, any fs will need to
be re-made between updates to the format.

Signed-off-by: default avatarJosef Bacik <josef@toxicpanda.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent 65faced5

fs/btrfs/ctree.h

+21 −0
Original line number Diff line number Diff line
@@ -300,6 +300,26 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE); 
#define BTRFS_FEATURE_COMPAT_RO_SAFE_SET	0ULL

#define BTRFS_FEATURE_COMPAT_RO_SAFE_CLEAR	0ULL



#ifdef CONFIG_BTRFS_DEBUG

/*

 * Extent tree v2 supported only with CONFIG_BTRFS_DEBUG

 */

#define BTRFS_FEATURE_INCOMPAT_SUPP			\

	(BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF |		\

	 BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL |	\

	 BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |		\

	 BTRFS_FEATURE_INCOMPAT_BIG_METADATA |		\

	 BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO |		\

	 BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD |		\

	 BTRFS_FEATURE_INCOMPAT_RAID56 |		\

	 BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF |		\

	 BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA |	\

	 BTRFS_FEATURE_INCOMPAT_NO_HOLES	|	\

	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID	|	\

	 BTRFS_FEATURE_INCOMPAT_RAID1C34	|	\

	 BTRFS_FEATURE_INCOMPAT_ZONED		|	\

	 BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2)

#else

#define BTRFS_FEATURE_INCOMPAT_SUPP			\

	(BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF |		\

	 BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL |	\
@@ -314,6 +334,7 @@ static_assert(sizeof(struct btrfs_super_block) == BTRFS_SUPER_INFO_SIZE); 
	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID	|	\

	 BTRFS_FEATURE_INCOMPAT_RAID1C34	|	\

	 BTRFS_FEATURE_INCOMPAT_ZONED)

#endif



#define BTRFS_FEATURE_INCOMPAT_SAFE_SET			\

	(BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF)

fs/btrfs/sysfs.c

+4 −1
Original line number Diff line number Diff line
@@ -283,9 +283,11 @@ 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);

/* Remove once support for zoned allocation is feature complete */

#ifdef CONFIG_BTRFS_DEBUG

/* Remove once support for zoned allocation is feature complete */

BTRFS_FEAT_ATTR_INCOMPAT(zoned, ZONED);

/* Remove once support for extent tree v2 is feature complete */

BTRFS_FEAT_ATTR_INCOMPAT(extent_tree_v2, EXTENT_TREE_V2);

#endif

#ifdef CONFIG_FS_VERITY

BTRFS_FEAT_ATTR_COMPAT_RO(verity, VERITY);
@@ -314,6 +316,7 @@ static struct attribute *btrfs_supported_feature_attrs[] = { 
	BTRFS_FEAT_ATTR_PTR(raid1c34),

#ifdef CONFIG_BTRFS_DEBUG

	BTRFS_FEAT_ATTR_PTR(zoned),

	BTRFS_FEAT_ATTR_PTR(extent_tree_v2),

#endif

#ifdef CONFIG_FS_VERITY

	BTRFS_FEAT_ATTR_PTR(verity),

include/uapi/linux/btrfs.h

+1 −0
Original line number Diff line number Diff line
@@ -309,6 +309,7 @@ struct btrfs_ioctl_fs_info_args { 
#define BTRFS_FEATURE_INCOMPAT_METADATA_UUID	(1ULL << 10)

#define BTRFS_FEATURE_INCOMPAT_RAID1C34		(1ULL << 11)

#define BTRFS_FEATURE_INCOMPAT_ZONED		(1ULL << 12)

#define BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2	(1ULL << 13)



struct btrfs_ioctl_feature_flags {

	__u64 compat_flags;