From e0bf3943a43a6d3961045fa35a357e5347c1032d Mon Sep 17 00:00:00 2001 From: Qu Wenruo Date: Thu, 13 Jun 2024 08:51:50 +0930 Subject: [PATCH] btrfs-progs: move RST back to experimental Currently raid-stripe-tree feature is still experimental as it requires a BTRFS_DEBUG kernel to recognize it. To avoid confusion move it back to experimental so regular users won't incorrectly set it. And since RST is no longer supported by default, also change the RST profile detection so that for non-experimental build we won't enable RST according to the data profiles. Signed-off-by: Qu Wenruo Signed-off-by: David Sterba --- common/fsfeatures.c | 2 ++ mkfs/main.c | 2 ++ 2 files changed, 4 insertions(+) diff --git a/common/fsfeatures.c b/common/fsfeatures.c index c5e81629..7aaddab6 100644 --- a/common/fsfeatures.c +++ b/common/fsfeatures.c @@ -222,6 +222,7 @@ static const struct btrfs_feature mkfs_features[] = { VERSION_NULL(default), .desc = "block group tree, more efficient block group tracking to reduce mount time" }, +#if EXPERIMENTAL { .name = "rst", .incompat_flag = BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE, @@ -238,6 +239,7 @@ static const struct btrfs_feature mkfs_features[] = { VERSION_NULL(default), .desc = "raid stripe tree, enhanced file extent tracking" }, +#endif { .name = "squota", .incompat_flag = BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA, diff --git a/mkfs/main.c b/mkfs/main.c index 0b9d1d78..8d0924ea 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1693,7 +1693,9 @@ int BOX_MAIN(mkfs)(int argc, char **argv) case BTRFS_BLOCK_GROUP_RAID1C4: case BTRFS_BLOCK_GROUP_RAID0: case BTRFS_BLOCK_GROUP_RAID10: +#if EXPERIMENTAL features.incompat_flags |= BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE; +#endif break; default: break;