* [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool
@ 2025-06-30 14:47 Johannes Thumshirn
2025-06-30 15:06 ` Daniel Vacek
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2025-06-30 14:47 UTC (permalink / raw)
To: linux-btrfs; +Cc: Johannes Thumshirn
From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
btrfs_dump_space_info()'s parameter dump_block_groups is used as a boolean
although it is defined as an integer.
Change it from int to bool.
Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
---
fs/btrfs/block-group.c | 8 ++++----
fs/btrfs/space-info.c | 7 ++++---
fs/btrfs/space-info.h | 2 +-
3 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
index 4259d955e70f..dc0b29ed46c0 100644
--- a/fs/btrfs/block-group.c
+++ b/fs/btrfs/block-group.c
@@ -1417,7 +1417,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
if (ret == -ENOSPC && btrfs_test_opt(cache->fs_info, ENOSPC_DEBUG)) {
btrfs_info(cache->fs_info,
"unable to make block group %llu ro", cache->start);
- btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, 0);
+ btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, false);
}
return ret;
}
@@ -4315,7 +4315,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
if (left < bytes && btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",
left, bytes, type);
- btrfs_dump_space_info(fs_info, info, 0, 0);
+ btrfs_dump_space_info(fs_info, info, 0, false);
}
if (left < bytes) {
@@ -4460,7 +4460,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
* indicates a real bug if this happens.
*/
if (WARN_ON(space_info->bytes_pinned > 0 || space_info->bytes_may_use > 0))
- btrfs_dump_space_info(info, space_info, 0, 0);
+ btrfs_dump_space_info(info, space_info, 0, false);
/*
* If there was a failure to cleanup a log tree, very likely due to an
@@ -4471,7 +4471,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
if (!(space_info->flags & BTRFS_BLOCK_GROUP_METADATA) ||
!BTRFS_FS_LOG_CLEANUP_ERROR(info)) {
if (WARN_ON(space_info->bytes_reserved > 0))
- btrfs_dump_space_info(info, space_info, 0, 0);
+ btrfs_dump_space_info(info, space_info, 0, false);
}
WARN_ON(space_info->reclaim_size > 0);
diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
index 102fcc34ffe2..65cc36ef3f75 100644
--- a/fs/btrfs/space-info.c
+++ b/fs/btrfs/space-info.c
@@ -615,7 +615,7 @@ static void __btrfs_dump_space_info(const struct btrfs_fs_info *fs_info,
void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *info, u64 bytes,
- int dump_block_groups)
+ bool dump_block_groups)
{
struct btrfs_block_group *cache;
u64 total_avail = 0;
@@ -1890,7 +1890,8 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
space_info->flags, orig_bytes, 1);
if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
- btrfs_dump_space_info(fs_info, space_info, orig_bytes, 0);
+ btrfs_dump_space_info(fs_info, space_info, orig_bytes,
+ false);
}
return ret;
}
@@ -1921,7 +1922,7 @@ int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,
trace_btrfs_space_reservation(fs_info, "space_info:enospc",
space_info->flags, bytes, 1);
if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
- btrfs_dump_space_info(fs_info, space_info, bytes, 0);
+ btrfs_dump_space_info(fs_info, space_info, bytes, false);
}
return ret;
}
diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
index 7de31541ab45..679f22efb407 100644
--- a/fs/btrfs/space-info.h
+++ b/fs/btrfs/space-info.h
@@ -278,7 +278,7 @@ u64 __pure btrfs_space_info_used(const struct btrfs_space_info *s_info,
void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *info, u64 bytes,
- int dump_block_groups);
+ bool dump_block_groups);
int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
struct btrfs_space_info *space_info,
u64 orig_bytes,
--
2.49.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool
2025-06-30 14:47 [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool Johannes Thumshirn
@ 2025-06-30 15:06 ` Daniel Vacek
2025-06-30 16:54 ` David Sterba
2025-06-30 21:30 ` Qu Wenruo
2 siblings, 0 replies; 5+ messages in thread
From: Daniel Vacek @ 2025-06-30 15:06 UTC (permalink / raw)
To: Johannes Thumshirn; +Cc: linux-btrfs, Johannes Thumshirn
On Mon, 30 Jun 2025 at 16:48, Johannes Thumshirn <jth@kernel.org> wrote:
>
> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>
> btrfs_dump_space_info()'s parameter dump_block_groups is used as a boolean
> although it is defined as an integer.
>
> Change it from int to bool.
>
> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
One nit below. Otherwise looks good to me.
Reviewed-by: Daniel Vacek <neelx@suse.com>
> ---
> fs/btrfs/block-group.c | 8 ++++----
> fs/btrfs/space-info.c | 7 ++++---
> fs/btrfs/space-info.h | 2 +-
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
> index 4259d955e70f..dc0b29ed46c0 100644
> --- a/fs/btrfs/block-group.c
> +++ b/fs/btrfs/block-group.c
> @@ -1417,7 +1417,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
> if (ret == -ENOSPC && btrfs_test_opt(cache->fs_info, ENOSPC_DEBUG)) {
> btrfs_info(cache->fs_info,
> "unable to make block group %llu ro", cache->start);
> - btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, 0);
> + btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, false);
> }
> return ret;
> }
> @@ -4315,7 +4315,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
> if (left < bytes && btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
> btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",
> left, bytes, type);
> - btrfs_dump_space_info(fs_info, info, 0, 0);
> + btrfs_dump_space_info(fs_info, info, 0, false);
> }
>
> if (left < bytes) {
> @@ -4460,7 +4460,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
> * indicates a real bug if this happens.
> */
> if (WARN_ON(space_info->bytes_pinned > 0 || space_info->bytes_may_use > 0))
> - btrfs_dump_space_info(info, space_info, 0, 0);
> + btrfs_dump_space_info(info, space_info, 0, false);
>
> /*
> * If there was a failure to cleanup a log tree, very likely due to an
> @@ -4471,7 +4471,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
> if (!(space_info->flags & BTRFS_BLOCK_GROUP_METADATA) ||
> !BTRFS_FS_LOG_CLEANUP_ERROR(info)) {
> if (WARN_ON(space_info->bytes_reserved > 0))
> - btrfs_dump_space_info(info, space_info, 0, 0);
> + btrfs_dump_space_info(info, space_info, 0, false);
> }
>
> WARN_ON(space_info->reclaim_size > 0);
> diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
> index 102fcc34ffe2..65cc36ef3f75 100644
> --- a/fs/btrfs/space-info.c
> +++ b/fs/btrfs/space-info.c
> @@ -615,7 +615,7 @@ static void __btrfs_dump_space_info(const struct btrfs_fs_info *fs_info,
>
> void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
> struct btrfs_space_info *info, u64 bytes,
> - int dump_block_groups)
> + bool dump_block_groups)
> {
> struct btrfs_block_group *cache;
> u64 total_avail = 0;
> @@ -1890,7 +1890,8 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
> space_info->flags, orig_bytes, 1);
>
> if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
> - btrfs_dump_space_info(fs_info, space_info, orig_bytes, 0);
> + btrfs_dump_space_info(fs_info, space_info, orig_bytes,
> + false);
This would still fit on one line pretty comfortably.
> }
> return ret;
> }
> @@ -1921,7 +1922,7 @@ int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,
> trace_btrfs_space_reservation(fs_info, "space_info:enospc",
> space_info->flags, bytes, 1);
> if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
> - btrfs_dump_space_info(fs_info, space_info, bytes, 0);
> + btrfs_dump_space_info(fs_info, space_info, bytes, false);
> }
> return ret;
> }
> diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
> index 7de31541ab45..679f22efb407 100644
> --- a/fs/btrfs/space-info.h
> +++ b/fs/btrfs/space-info.h
> @@ -278,7 +278,7 @@ u64 __pure btrfs_space_info_used(const struct btrfs_space_info *s_info,
> void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
> void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
> struct btrfs_space_info *info, u64 bytes,
> - int dump_block_groups);
> + bool dump_block_groups);
> int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
> struct btrfs_space_info *space_info,
> u64 orig_bytes,
> --
> 2.49.0
>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool
2025-06-30 14:47 [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool Johannes Thumshirn
2025-06-30 15:06 ` Daniel Vacek
@ 2025-06-30 16:54 ` David Sterba
2025-07-01 9:57 ` Johannes Thumshirn
2025-06-30 21:30 ` Qu Wenruo
2 siblings, 1 reply; 5+ messages in thread
From: David Sterba @ 2025-06-30 16:54 UTC (permalink / raw)
To: Johannes Thumshirn; +Cc: linux-btrfs, Johannes Thumshirn
On Mon, Jun 30, 2025 at 04:47:35PM +0200, Johannes Thumshirn wrote:
> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>
> btrfs_dump_space_info()'s parameter dump_block_groups is used as a boolean
> although it is defined as an integer.
>
> Change it from int to bool.
>
> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: David Sterba <dsterba@suse.com>
It may be possible to write a coccinelle script to find them, otherwise
it's only by reading the code, so feel free to fix them on sight.
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool
2025-06-30 14:47 [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool Johannes Thumshirn
2025-06-30 15:06 ` Daniel Vacek
2025-06-30 16:54 ` David Sterba
@ 2025-06-30 21:30 ` Qu Wenruo
2 siblings, 0 replies; 5+ messages in thread
From: Qu Wenruo @ 2025-06-30 21:30 UTC (permalink / raw)
To: Johannes Thumshirn, linux-btrfs; +Cc: Johannes Thumshirn
在 2025/7/1 00:17, Johannes Thumshirn 写道:
> From: Johannes Thumshirn <johannes.thumshirn@wdc.com>
>
> btrfs_dump_space_info()'s parameter dump_block_groups is used as a boolean
> although it is defined as an integer.
>
> Change it from int to bool.
>
> Signed-off-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Thanks,
Qu
> ---
> fs/btrfs/block-group.c | 8 ++++----
> fs/btrfs/space-info.c | 7 ++++---
> fs/btrfs/space-info.h | 2 +-
> 3 files changed, 9 insertions(+), 8 deletions(-)
>
> diff --git a/fs/btrfs/block-group.c b/fs/btrfs/block-group.c
> index 4259d955e70f..dc0b29ed46c0 100644
> --- a/fs/btrfs/block-group.c
> +++ b/fs/btrfs/block-group.c
> @@ -1417,7 +1417,7 @@ static int inc_block_group_ro(struct btrfs_block_group *cache, int force)
> if (ret == -ENOSPC && btrfs_test_opt(cache->fs_info, ENOSPC_DEBUG)) {
> btrfs_info(cache->fs_info,
> "unable to make block group %llu ro", cache->start);
> - btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, 0);
> + btrfs_dump_space_info(cache->fs_info, cache->space_info, 0, false);
> }
> return ret;
> }
> @@ -4315,7 +4315,7 @@ static void reserve_chunk_space(struct btrfs_trans_handle *trans,
> if (left < bytes && btrfs_test_opt(fs_info, ENOSPC_DEBUG)) {
> btrfs_info(fs_info, "left=%llu, need=%llu, flags=%llu",
> left, bytes, type);
> - btrfs_dump_space_info(fs_info, info, 0, 0);
> + btrfs_dump_space_info(fs_info, info, 0, false);
> }
>
> if (left < bytes) {
> @@ -4460,7 +4460,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
> * indicates a real bug if this happens.
> */
> if (WARN_ON(space_info->bytes_pinned > 0 || space_info->bytes_may_use > 0))
> - btrfs_dump_space_info(info, space_info, 0, 0);
> + btrfs_dump_space_info(info, space_info, 0, false);
>
> /*
> * If there was a failure to cleanup a log tree, very likely due to an
> @@ -4471,7 +4471,7 @@ static void check_removing_space_info(struct btrfs_space_info *space_info)
> if (!(space_info->flags & BTRFS_BLOCK_GROUP_METADATA) ||
> !BTRFS_FS_LOG_CLEANUP_ERROR(info)) {
> if (WARN_ON(space_info->bytes_reserved > 0))
> - btrfs_dump_space_info(info, space_info, 0, 0);
> + btrfs_dump_space_info(info, space_info, 0, false);
> }
>
> WARN_ON(space_info->reclaim_size > 0);
> diff --git a/fs/btrfs/space-info.c b/fs/btrfs/space-info.c
> index 102fcc34ffe2..65cc36ef3f75 100644
> --- a/fs/btrfs/space-info.c
> +++ b/fs/btrfs/space-info.c
> @@ -615,7 +615,7 @@ static void __btrfs_dump_space_info(const struct btrfs_fs_info *fs_info,
>
> void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
> struct btrfs_space_info *info, u64 bytes,
> - int dump_block_groups)
> + bool dump_block_groups)
> {
> struct btrfs_block_group *cache;
> u64 total_avail = 0;
> @@ -1890,7 +1890,8 @@ int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
> space_info->flags, orig_bytes, 1);
>
> if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
> - btrfs_dump_space_info(fs_info, space_info, orig_bytes, 0);
> + btrfs_dump_space_info(fs_info, space_info, orig_bytes,
> + false);
> }
> return ret;
> }
> @@ -1921,7 +1922,7 @@ int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,
> trace_btrfs_space_reservation(fs_info, "space_info:enospc",
> space_info->flags, bytes, 1);
> if (btrfs_test_opt(fs_info, ENOSPC_DEBUG))
> - btrfs_dump_space_info(fs_info, space_info, bytes, 0);
> + btrfs_dump_space_info(fs_info, space_info, bytes, false);
> }
> return ret;
> }
> diff --git a/fs/btrfs/space-info.h b/fs/btrfs/space-info.h
> index 7de31541ab45..679f22efb407 100644
> --- a/fs/btrfs/space-info.h
> +++ b/fs/btrfs/space-info.h
> @@ -278,7 +278,7 @@ u64 __pure btrfs_space_info_used(const struct btrfs_space_info *s_info,
> void btrfs_clear_space_info_full(struct btrfs_fs_info *info);
> void btrfs_dump_space_info(struct btrfs_fs_info *fs_info,
> struct btrfs_space_info *info, u64 bytes,
> - int dump_block_groups);
> + bool dump_block_groups);
> int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info,
> struct btrfs_space_info *space_info,
> u64 orig_bytes,
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool
2025-06-30 16:54 ` David Sterba
@ 2025-07-01 9:57 ` Johannes Thumshirn
0 siblings, 0 replies; 5+ messages in thread
From: Johannes Thumshirn @ 2025-07-01 9:57 UTC (permalink / raw)
To: dsterba@suse.cz, Johannes Thumshirn; +Cc: linux-btrfs@vger.kernel.org
On 30.06.25 18:54, David Sterba wrote:
> It may be possible to write a coccinelle script to find them, otherwise
> it's only by reading the code, so feel free to fix them on sight.
Yep reading code to debug finds lots of opportunities...
btrfs_reserve_extent() is the next candidate :/
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2025-07-01 9:57 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2025-06-30 14:47 [PATCH] btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool Johannes Thumshirn
2025-06-30 15:06 ` Daniel Vacek
2025-06-30 16:54 ` David Sterba
2025-07-01 9:57 ` Johannes Thumshirn
2025-06-30 21:30 ` Qu Wenruo
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox