]> git.hungrycats.org Git - btrfs-progs/commitdiff
btrfs-progs: sync BTRFS_FEATURE_INCOMPAT_SUPP_STABLE from the kernel
authorQu Wenruo <wqu@suse.com>
Sat, 27 Jun 2026 04:30:49 +0000 (14:00 +0930)
committerQu Wenruo <wqu@suse.com>
Mon, 20 Jul 2026 22:49:40 +0000 (08:19 +0930)
Unlike kernel, btrfs-progs was using explicit definitions for
experimental and regular builds.

This makes maintaining them much harder, since there are already 14
different features just for non-experimental builds.

Simplify the definition by pulling BTRFS_FEATURE_INCOMPAT_SUPP_STABLE
from kernel, and only add new features into experimental builds based on
that BTRFS_FEATURE_INCOMPAT_SUPP_STABLE macro.

This also addresses a small feature mismatch, the feature
raid-stripe-tree is still experimental in the kernel, and all involved
feature flags are also only defined for experimental progs builds, but
it's still defined as supported feature.

Now progs will share the same feature as kernels, for both experimental
and regular builds.

Signed-off-by: Qu Wenruo <wqu@suse.com>
kernel-shared/ctree.h

index 877092a7907d039b86b834b0d5c3f510761967ce..93fd7f18049e6e89add23ab8a974744b4c085d46 100644 (file)
@@ -77,43 +77,32 @@ static inline u32 __BTRFS_LEAF_DATA_SIZE(u32 nodesize)
         BTRFS_FEATURE_COMPAT_RO_VERITY |               \
         BTRFS_FEATURE_COMPAT_RO_BLOCK_GROUP_TREE)
 
-#if EXPERIMENTAL
-#define BTRFS_FEATURE_INCOMPAT_SUPP                    \
+#define BTRFS_FEATURE_INCOMPAT_SUPP_STABLE             \
        (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF |         \
         BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL |        \
+        BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |          \
+        BTRFS_FEATURE_INCOMPAT_BIG_METADATA |          \
         BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO |          \
         BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD |         \
-        BTRFS_FEATURE_INCOMPAT_BIG_METADATA |          \
-        BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF |         \
         BTRFS_FEATURE_INCOMPAT_RAID56 |                \
-        BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |          \
+        BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF |         \
         BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA |       \
-        BTRFS_FEATURE_INCOMPAT_NO_HOLES |              \
-        BTRFS_FEATURE_INCOMPAT_RAID1C34 |              \
-        BTRFS_FEATURE_INCOMPAT_METADATA_UUID |         \
-        BTRFS_FEATURE_INCOMPAT_ZONED |                 \
+        BTRFS_FEATURE_INCOMPAT_NO_HOLES        |       \
+        BTRFS_FEATURE_INCOMPAT_METADATA_UUID   |       \
+        BTRFS_FEATURE_INCOMPAT_RAID1C34        |       \
+        BTRFS_FEATURE_INCOMPAT_ZONED           |       \
+        BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA)
+
+#if EXPERIMENTAL
+#define BTRFS_FEATURE_INCOMPAT_SUPP                    \
+       (BTRFS_FEATURE_INCOMPAT_SUPP_STABLE |           \
         BTRFS_FEATURE_INCOMPAT_EXTENT_TREE_V2 |        \
         BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE |      \
         BTRFS_FEATURE_INCOMPAT_ENCRYPT |               \
-        BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA |          \
         BTRFS_FEATURE_INCOMPAT_REMAP_TREE)
 #else
 #define BTRFS_FEATURE_INCOMPAT_SUPP                    \
-       (BTRFS_FEATURE_INCOMPAT_MIXED_BACKREF |         \
-        BTRFS_FEATURE_INCOMPAT_DEFAULT_SUBVOL |        \
-        BTRFS_FEATURE_INCOMPAT_COMPRESS_LZO |          \
-        BTRFS_FEATURE_INCOMPAT_COMPRESS_ZSTD |         \
-        BTRFS_FEATURE_INCOMPAT_BIG_METADATA |          \
-        BTRFS_FEATURE_INCOMPAT_EXTENDED_IREF |         \
-        BTRFS_FEATURE_INCOMPAT_RAID56 |                \
-        BTRFS_FEATURE_INCOMPAT_MIXED_GROUPS |          \
-        BTRFS_FEATURE_INCOMPAT_SKINNY_METADATA |       \
-        BTRFS_FEATURE_INCOMPAT_NO_HOLES |              \
-        BTRFS_FEATURE_INCOMPAT_RAID1C34 |              \
-        BTRFS_FEATURE_INCOMPAT_METADATA_UUID |         \
-        BTRFS_FEATURE_INCOMPAT_ZONED |                 \
-        BTRFS_FEATURE_INCOMPAT_RAID_STRIPE_TREE |      \
-        BTRFS_FEATURE_INCOMPAT_SIMPLE_QUOTA)
+       (BTRFS_FEATURE_INCOMPAT_SUPP_STABLE)
 #endif
 
 /*