Commit b188ad77 authored Nov 14, 2024 by Filipe Manana Committed by David Sterba Nov 28, 2024

btrfs: sysfs: advertise experimental features only if CONFIG_BTRFS_EXPERIMENTAL=y



We are advertising experimental features through sysfs if
CONFIG_BTRFS_DEBUG is set, without looking if CONFIG_BTRFS_EXPERIMENTAL
is set. This is wrong as it will result in reporting experimental
features as supported when CONFIG_BTRFS_EXPERIMENTAL is not set but
CONFIG_BTRFS_DEBUG is set.

Fix this by checking for CONFIG_BTRFS_EXPERIMENTAL instead of
CONFIG_BTRFS_DEBUG.

Fixes: 67cd3f22 ("btrfs: split out CONFIG_BTRFS_EXPERIMENTAL from CONFIG_BTRFS_DEBUG")
Reviewed-by: Neal Gompa <neal@gompa.dev>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

parent 7d6872cc

fs/btrfs/sysfs.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -295,7 +295,7 @@ BTRFS_FEAT_ATTR_INCOMPAT(simple_quota, SIMPLE_QUOTA);
		#ifdef CONFIG_BLK_DEV_ZONED
		BTRFS_FEAT_ATTR_INCOMPAT(zoned, ZONED);
		#endif
		#ifdef CONFIG_BTRFS_DEBUG
		#ifdef CONFIG_BTRFS_EXPERIMENTAL
		/* Remove once support for extent tree v2 is feature complete */
		BTRFS_FEAT_ATTR_INCOMPAT(extent_tree_v2, EXTENT_TREE_V2);
		/* Remove once support for raid stripe tree is feature complete. */
		@@ -329,7 +329,7 @@ static struct attribute *btrfs_supported_feature_attrs[] = {
		#ifdef CONFIG_BLK_DEV_ZONED
		BTRFS_FEAT_ATTR_PTR(zoned),
		#endif
		#ifdef CONFIG_BTRFS_DEBUG
		#ifdef CONFIG_BTRFS_EXPERIMENTAL
		BTRFS_FEAT_ATTR_PTR(extent_tree_v2),
		BTRFS_FEAT_ATTR_PTR(raid_stripe_tree),
		#endif