[PATCH RFC] btrfs: sysfs: bytes_zone_unusable is not under CONFIG_BTRFS_DEBUG

[PATCH RFC] btrfs: sysfs: bytes_zone_unusable is not under CONFIG_BTRFS_DEBUG

[Anand Jain]

Sysfs zoned file is under CONFIG_BTRFS_DEBUG (now there is a patch to
bring it under CONFIG_BLK_DEV_ZONED). But sysfs file bytes_zone_unusable
has escaped the CONFIG_BTRFS_DEBUG config. There is no problem with this
as bytes_zone_unusable with no zoned configured shall display 0, so it is
just a matter of fixing the consistency.

Signed-off-by: Anand Jain <anand.jain@oracle.com>
---
RFC because in my understanding, there is no way to fix this
inconsistency without failing the ABI compliance test, so it is just
better to leave it as it is.

 fs/btrfs/sysfs.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/fs/btrfs/sysfs.c b/fs/btrfs/sysfs.c
index cb00c0c08949..baef8f4b972e 100644
--- a/fs/btrfs/sysfs.c
+++ b/fs/btrfs/sysfs.c
@@ -702,7 +702,10 @@ SPACE_INFO_ATTR(bytes_pinned);
 SPACE_INFO_ATTR(bytes_reserved);
 SPACE_INFO_ATTR(bytes_may_use);
 SPACE_INFO_ATTR(bytes_readonly);
+/* Remove once support for zoned allocation is feature complete */
+#ifdef CONFIG_BTRFS_DEBUG
 SPACE_INFO_ATTR(bytes_zone_unusable);
+#endif
 SPACE_INFO_ATTR(disk_used);
 SPACE_INFO_ATTR(disk_total);
 
@@ -714,7 +717,9 @@ static struct attribute *space_info_attrs[] = {
 	BTRFS_ATTR_PTR(space_info, bytes_reserved),
 	BTRFS_ATTR_PTR(space_info, bytes_may_use),
 	BTRFS_ATTR_PTR(space_info, bytes_readonly),
+#ifdef CONFIG_BTRFS_DEBUG
 	BTRFS_ATTR_PTR(space_info, bytes_zone_unusable),
+#endif
 	BTRFS_ATTR_PTR(space_info, disk_used),
 	BTRFS_ATTR_PTR(space_info, disk_total),
 	NULL,
-- 
2.31.1

Re: [PATCH RFC] btrfs: sysfs: bytes_zone_unusable is not under CONFIG_BTRFS_DEBUG

[David Sterba]

On Thu, Aug 05, 2021 at 09:07:00AM +0800, Anand Jain wrote:
> Sysfs zoned file is under CONFIG_BTRFS_DEBUG (now there is a patch to
> bring it under CONFIG_BLK_DEV_ZONED). But sysfs file bytes_zone_unusable
> has escaped the CONFIG_BTRFS_DEBUG config. There is no problem with this
> as bytes_zone_unusable with no zoned configured shall display 0, so it is
> just a matter of fixing the consistency.
> 
> Signed-off-by: Anand Jain <anand.jain@oracle.com>
> ---
> RFC because in my understanding, there is no way to fix this
> inconsistency without failing the ABI compliance test, so it is just
> better to leave it as it is.

Good find but I think we can keep it there unconditionally, that's the
long term plan. Hiding zoned mode behind debug option was meant only for
the beginning until the worst bugs are ironed out.