Skip to contentSkip to conversation

btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool

PATCH In review Johannes Thumshirn 5 participants 5 messages Jun 30, 2025 – Jul 1, 2025 Btrfs file system

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 btrfs: change dump_block_groups in btrfs_dump_space_info from int to bool

From: Johannes Thumshirn <[email protected]>

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.

---
 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(-)
fs/btrfs/block-group.c +4 -4
index 4259d955e70f..dc0b29ed46c0 100644
@@ -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);
fs/btrfs/space-info.c +4 -3
index 102fcc34ffe2..65cc36ef3f75 100644
@@ -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;
 }
fs/btrfs/space-info.h +1 -1
index 7de31541ab45..679f22efb407 100644
@@ -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,
Signature · 1 line
2.49.0
Reviewed-by on v1 1/1
#1 lore raw
Quoted 9 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

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.

One nit below. Otherwise looks good to me.

Quoted 60 lines
---
 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(-)
fs/btrfs/block-group.c +4 -4
index 4259d955e70f..dc0b29ed46c0 100644
@@ -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);
fs/btrfs/space-info.c +1 -1
index 102fcc34ffe2..65cc36ef3f75 100644
@@ -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;

fs/btrfs/space-info.c int btrfs_reserve_metadata_bytes(struct btrfs_fs_info *fs_info, · line 1894

Quoted 6 lines
fs/btrfs/space-info.c +2 -1
@@ -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.

Quoted 29 lines
fs/btrfs/space-info.c +1 -1
        }
        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;
 }
fs/btrfs/space-info.h +1 -2
index 7de31541ab45..679f22efb407 100644
@@ -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

Reviewed-by on v1 1/1
#2 lore raw
In reply to Johannes Thumshirn
Quoted 8 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

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.

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.

#3 lore raw
Quoted 2 lines · David Sterba

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 :/

Reviewed-by on v1 1/1
#4 lore raw
In reply to Johannes Thumshirn
Quoted 8 lines · Johannes Thumshirn

From: Johannes Thumshirn <[email protected]>

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.

Thanks,
Qu

Quoted 91 lines
---
  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(-)
fs/btrfs/block-group.c +4 -4
index 4259d955e70f..dc0b29ed46c0 100644
@@ -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);
fs/btrfs/space-info.c +4 -3
index 102fcc34ffe2..65cc36ef3f75 100644
@@ -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;
  }
fs/btrfs/space-info.h +1 -1
index 7de31541ab45..679f22efb407 100644
@@ -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,