diff --git a/common/fsfeatures.c b/common/fsfeatures.c index deeb067c..8ce9d1dc 100644 --- a/common/fsfeatures.c +++ b/common/fsfeatures.c @@ -221,7 +221,6 @@ static const struct btrfs_feature mkfs_features[] = { VERSION_NULL(default), .desc = "block group tree to reduce mount time" }, -#if EXPERIMENTAL { .name = "rst", .incompat_flag = BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE, @@ -247,7 +246,6 @@ static const struct btrfs_feature mkfs_features[] = { VERSION_NULL(default), .desc = "squota support (simple accounting qgroups)" }, -#endif /* Keep this one last */ { .name = "list-all", diff --git a/kernel-shared/ctree.h b/kernel-shared/ctree.h index a11961d2..bcf11d87 100644 --- a/kernel-shared/ctree.h +++ b/kernel-shared/ctree.h @@ -123,6 +123,7 @@ static inline u32 __BTRFS_LEAF_DATA_SIZE(u32 nodesize) BTRFS_FEATURE_INCOMPAT_RAID1C34 | \ BTRFS_FEATURE_INCOMPAT_METADATA_UUID | \ BTRFS_FEATURE_INCOMPAT_ZONED | \ + BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE | \ BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA) #endif diff --git a/kernel-shared/disk-io.c b/kernel-shared/disk-io.c index 98fad290..1b1531c5 100644 --- a/kernel-shared/disk-io.c +++ b/kernel-shared/disk-io.c @@ -1295,7 +1295,6 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr, return -EIO; } -#if EXPERIMENTAL if (btrfs_fs_incompat(fs_info, RAID_STRIPE_TREE)) { ret = btrfs_find_and_setup_root(root, fs_info, BTRFS_RAID_STRIPE_TREE_OBJECTID, @@ -1307,7 +1306,6 @@ int btrfs_setup_all_roots(struct btrfs_fs_info *fs_info, u64 root_tree_bytenr, set_bit(BTRFS_ROOT_TRACK_DIRTY, &fs_info->stripe_root->state); } } -#endif if (maybe_load_block_groups(fs_info, flags)) { ret = btrfs_read_block_groups(fs_info); diff --git a/kernel-shared/zoned.c b/kernel-shared/zoned.c index db84f89a..16e83f8b 100644 --- a/kernel-shared/zoned.c +++ b/kernel-shared/zoned.c @@ -757,7 +757,6 @@ bool zoned_profile_supported(u64 map_type, bool rst) if (flags == 0) return true; -#if EXPERIMENTAL if (data) { if ((flags & BTRFS_BLOCK_GROUP_DUP) && rst) return true; @@ -784,10 +783,6 @@ bool zoned_profile_supported(u64 map_type, bool rst) if (flags & BTRFS_BLOCK_GROUP_RAID10) return true; } -#else - if (!data && (flags & BTRFS_BLOCK_GROUP_DUP)) - return true; -#endif /* All other profiles are not supported yet */ return false; diff --git a/mkfs/main.c b/mkfs/main.c index fe41e4fd..5abf7605 100644 --- a/mkfs/main.c +++ b/mkfs/main.c @@ -1623,7 +1623,6 @@ int BOX_MAIN(mkfs)(int argc, char **argv) if (ret) goto error; -#if EXPERIMENTAL if (opt_zoned && device_count) { switch (data_profile & BTRFS_BLOCK_GROUP_PROFILE_MASK) { case BTRFS_BLOCK_GROUP_DUP: @@ -1638,21 +1637,18 @@ int BOX_MAIN(mkfs)(int argc, char **argv) break; } } -#endif if (opt_zoned) { u64 metadata = BTRFS_BLOCK_GROUP_METADATA | metadata_profile; u64 data = BTRFS_BLOCK_GROUP_DATA | data_profile; bool rst = false; -#if EXPERIMENTAL if (features.incompat_flags & BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE) rst = true; -#endif if (!zoned_profile_supported(metadata, rst) || !zoned_profile_supported(data, rst)) { - error("zoned mode does not yet support RAID/DUP profiles, please specify '-d single -m single' manually"); + error("zoned mode does not yet support the selected RAID profiles"); goto error; } }