Commit 0f202b25 authored by Anand Jain's avatar Anand Jain Committed by David Sterba
Browse files

btrfs: avoid repetitive define BTRFS_FEATURE_INCOMPAT_SUPP 



BTRFS_FEATURE_INCOMPAT_SUPP is defined twice, once under
CONFIG_BTRFS_DEBUG and once without it, resulting in repetitive code. The
reason for this is to add experimental features under CONFIG_BTRFS_DEBUG.

To avoid repetitive code, add a common list BTRFS_FEATURE_INCOMPAT_SUPP_STABLE,
and append experimental features only under CONFIG_BTRFS_DEBUG.

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>
parent 6b4d375a

fs/btrfs/fs.h

+15 −20
Original line number Diff line number Diff line
@@ -193,11 +193,7 @@ enum { 
#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			\

#define BTRFS_FEATURE_INCOMPAT_SUPP_STABLE		\

	(BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF |		\

	 BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL |	\

	 BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |		\
@@ -210,23 +206,22 @@ enum { 
	 BTRFS_FEATURE_INCOMPAT_NO_HOLES	|	\

	 BTRFS_FEATURE_INCOMPAT_METADATA_UUID	|	\

	 BTRFS_FEATURE_INCOMPAT_RAID1C34	|	\

	 BTRFS_FEATURE_INCOMPAT_ZONED		|	\

	 BTRFS_FEATURE_INCOMPAT_ZONED)



#ifdef CONFIG_BTRFS_DEBUG

	/*

	 * Features under developmen like Extent tree v2 support is enabled

	 * only under CONFIG_BTRFS_DEBUG.

	 */

#define BTRFS_FEATURE_INCOMPAT_SUPP		\

	(BTRFS_FEATURE_INCOMPAT_SUPP_STABLE |	\

	 BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2)



#else



#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_SUPP_STABLE)



#endif



#define BTRFS_FEATURE_INCOMPAT_SAFE_SET			\