Commit 67cd3f22 authored by Qu Wenruo's avatar Qu Wenruo Committed by David Sterba
Browse files

btrfs: split out CONFIG_BTRFS_EXPERIMENTAL from CONFIG_BTRFS_DEBUG 



Currently CONFIG_BTRFS_EXPERIMENTAL is not only for the extra debugging
output, but also for experimental features.

This is not ideal to distinguish planned but not yet stable features
from those purely designed for debugging.

This patch splits the following features into CONFIG_BTRFS_EXPERIMENTAL:

- Extent map shrinker
  This seems to be the first one to exit experimental.

- Extent tree v2
  This seems to be the last one to graduate from experimental.

- Raid stripe tree
- Csum offload mode
- Send protocol v3

Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarQu Wenruo <wqu@suse.com>
Reviewed-by: default avatarDavid Sterba <dsterba@suse.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent c186345a

fs/btrfs/Kconfig

+26 −0
Original line number Diff line number Diff line
@@ -78,6 +78,32 @@ config BTRFS_ASSERT 


	  If unsure, say N.



config BTRFS_EXPERIMENTAL

	bool "Btrfs experimental features"

	depends on BTRFS_FS

	default n

	help

	  Enable experimental features.  These features may not be stable enough

	  for end users.  This is meant for btrfs developers or users who wish

	  to test the functionality and report problems.



	  Current list:



	  - extent map shrinker - performance problems with too frequent shrinks



	  - send stream protocol v3 - fs-verity support



	  - checksum offload mode - sysfs knob to affect when checksums are

	                            calculated (at IO time, or in a thread)



	  - raid-stripe-tree - additional mapping of extents to devices to

			       support RAID1* profiles on zoned devices,

			       RAID56 not yet supported



	  - extent tree v2 - complex rework of extent tracking



	  If unsure, say N.



config BTRFS_FS_REF_VERIFY

	bool "Btrfs with the ref verify tool compiled in"

	depends on BTRFS_FS

fs/btrfs/bio.c

+1 −1
Original line number Diff line number Diff line
@@ -587,7 +587,7 @@ static bool should_async_write(struct btrfs_bio *bbio) 
{

	bool auto_csum_mode = true;



#ifdef CONFIG_BTRFS_DEBUG

#ifdef CONFIG_BTRFS_EXPERIMENTAL

	struct btrfs_fs_devices *fs_devices = bbio->fs_info->fs_devices;

	enum btrfs_offload_csum_mode csum_mode = READ_ONCE(fs_devices->offload_csum_mode);

fs/btrfs/fs.h

+2 −2
Original line number Diff line number Diff line
@@ -263,10 +263,10 @@ enum { 
	 BTRFS_FEATURE_INCOMPAT_ZONED		|	\

	 BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA)



#ifdef CONFIG_BTRFS_DEBUG

#ifdef CONFIG_BTRFS_EXPERIMENTAL

	/*

	 * Features under developmen like Extent tree v2 support is enabled

	 * only under CONFIG_BTRFS_DEBUG.

	 * only under CONFIG_BTRFS_EXPERIMENTAL

	 */

#define BTRFS_FEATURE_INCOMPAT_SUPP		\

	(BTRFS_FEATURE_INCOMPAT_SUPP_STABLE |	\

fs/btrfs/send.h

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct btrfs_ioctl_send_args; 


#define BTRFS_SEND_STREAM_MAGIC "btrfs-stream"

/* Conditional support for the upcoming protocol version. */

#ifdef CONFIG_BTRFS_DEBUG

#ifdef CONFIG_BTRFS_EXPERIMENTAL

#define BTRFS_SEND_STREAM_VERSION 3

#else

#define BTRFS_SEND_STREAM_VERSION 2

fs/btrfs/super.c

+3 −3
Original line number Diff line number Diff line
@@ -2396,10 +2396,10 @@ static long btrfs_nr_cached_objects(struct super_block *sb, struct shrink_contro 
	trace_btrfs_extent_map_shrinker_count(fs_info, nr);



	/*

	 * Only report the real number for DEBUG builds, as there are reports of

	 * serious performance degradation caused by too frequent shrinks.

	 * Only report the real number for EXPERIMENTAL builds, as there are

	 * reports of serious performance degradation caused by too frequent shrinks.

	 */

	if (IS_ENABLED(CONFIG_BTRFS_DEBUG))

	if (IS_ENABLED(CONFIG_BTRFS_EXPERIMENTAL))

		return nr;

	return 0;

}