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 <wqu@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
parent
7ca1e41093
commit
e0bf3943a4
|
@ -222,6 +222,7 @@ static const struct btrfs_feature mkfs_features[] = {
|
||||||
VERSION_NULL(default),
|
VERSION_NULL(default),
|
||||||
.desc = "block group tree, more efficient block group tracking to reduce mount time"
|
.desc = "block group tree, more efficient block group tracking to reduce mount time"
|
||||||
},
|
},
|
||||||
|
#if EXPERIMENTAL
|
||||||
{
|
{
|
||||||
.name = "rst",
|
.name = "rst",
|
||||||
.incompat_flag = BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE,
|
.incompat_flag = BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE,
|
||||||
|
@ -238,6 +239,7 @@ static const struct btrfs_feature mkfs_features[] = {
|
||||||
VERSION_NULL(default),
|
VERSION_NULL(default),
|
||||||
.desc = "raid stripe tree, enhanced file extent tracking"
|
.desc = "raid stripe tree, enhanced file extent tracking"
|
||||||
},
|
},
|
||||||
|
#endif
|
||||||
{
|
{
|
||||||
.name = "squota",
|
.name = "squota",
|
||||||
.incompat_flag = BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA,
|
.incompat_flag = BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA,
|
||||||
|
|
|
@ -1693,7 +1693,9 @@ int BOX_MAIN(mkfs)(int argc, char **argv)
|
||||||
case BTRFS_BLOCK_GROUP_RAID1C4:
|
case BTRFS_BLOCK_GROUP_RAID1C4:
|
||||||
case BTRFS_BLOCK_GROUP_RAID0:
|
case BTRFS_BLOCK_GROUP_RAID0:
|
||||||
case BTRFS_BLOCK_GROUP_RAID10:
|
case BTRFS_BLOCK_GROUP_RAID10:
|
||||||
|
#if EXPERIMENTAL
|
||||||
features.incompat_flags |= BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE;
|
features.incompat_flags |= BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE;
|
||||||
|
#endif
|
||||||
break;
|
break;
|
||||||
default:
|
default:
|
||||||
break;
|
break;
|
||||||
|
|
Loading…
Reference in New Issue