Skip to contentSkip to conversation

btrfs: move BTRFS_FEAT_ATTR_INCOMPAT for remap tree behind EXPERIMENTAL

PATCH In review Mark Harmstone 2 participants 2 messages Jan 20 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: move BTRFS_FEAT_ATTR_INCOMPAT for remap tree behind EXPERIMENTAL

The patch "btrfs: add definitions and constants for remap-tree" added a BTRFS_FEAT_ATTR_INCOMPAT for remap tree, but this should have been behind a CONFIG_BTRFS_EXPERIMENTAL #ifdef in order to avoid an unused variable warning.

---
 fs/btrfs/sysfs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
fs/btrfs/sysfs.c +2 -1
index 21645a98cfe7..27bfb7b55ec4 100644
@@ -291,7 +291,6 @@ BTRFS_FEAT_ATTR_COMPAT_RO(free_space_tree, FREE_SPACE_TREE);
 BTRFS_FEAT_ATTR_COMPAT_RO(block_group_tree, BLOCK_GROUP_TREE);
 BTRFS_FEAT_ATTR_INCOMPAT(raid1c34, RAID1C34);
 BTRFS_FEAT_ATTR_INCOMPAT(simple_quota, SIMPLE_QUOTA);
-BTRFS_FEAT_ATTR_INCOMPAT(remap_tree, REMAP_TREE);
 #ifdef CONFIG_BLK_DEV_ZONED
 BTRFS_FEAT_ATTR_INCOMPAT(zoned, ZONED);
 #endif
@@ -300,6 +299,8 @@ BTRFS_FEAT_ATTR_INCOMPAT(zoned, ZONED);
 BTRFS_FEAT_ATTR_INCOMPAT(extent_tree_v2, EXTENT_TREE_V2);
 /* Remove once support for raid stripe tree is feature complete. */
 BTRFS_FEAT_ATTR_INCOMPAT(raid_stripe_tree, RAID_STRIPE_TREE);
+/* Remove once support for remap tree is feature complete. */
+BTRFS_FEAT_ATTR_INCOMPAT(remap_tree, REMAP_TREE);
 #endif
 #ifdef CONFIG_FS_VERITY
 BTRFS_FEAT_ATTR_COMPAT_RO(verity, VERITY);
Signature · 1 line
2.51.2
#1 lore raw
Quoted 6 lines · Mark Harmstone

The patch "btrfs: add definitions and constants for remap-tree" added a BTRFS_FEAT_ATTR_INCOMPAT for remap tree, but this should have been behind a CONFIG_BTRFS_EXPERIMENTAL #ifdef in order to avoid an unused variable warning.

Folded to for-next, thanks.