btrfs: make a few more ASSERTs verbose
David Sterba
maintainerPATCH 1/1 btrfs: make a few more ASSERTs verbose
We have support for optional string to be printed in ASSERT() (added in 19468a623a9109 ("btrfs: enhance ASSERT() to take optional format string")), it's not yet everywhere it could be so add a few more files.
Signed-off-by David Sterba <[email protected]>
--- fs/btrfs/scrub.c | 17 ++++++++------- fs/btrfs/space-info.c | 30 ++++++++++++++++----------- fs/btrfs/subpage.c | 10 ++++++--- fs/btrfs/transaction.c | 41 +++++++++++++++++++++++++----------- fs/btrfs/tree-checker.c | 2 +- fs/btrfs/tree-log.c | 46 +++++++++++++++++++++++++++-------------- fs/btrfs/zoned.c | 37 ++++++++++++++++++++------------- 7 files changed, 119 insertions(+), 64 deletions(-)
fs/btrfs/scrub.c +10 -7
@@ -964,8 +964,9 @@ static void scrub_stripe_submit_repair_read(struct scrub_stripe *stripe,const unsigned long old_error_bitmap =scrub_bitmap_read_error (stripe);int i; -ASSERT (stripe->mirror_num >=1 ); -ASSERT (atomic_read (&stripe->pending_io) ==0 ); +ASSERT (stripe->mirror_num >=1 ,"stripe->mirror_num=%d" , stripe->mirror_num); +ASSERT (atomic_read (&stripe->pending_io) ==0 , +"atomic_read(&stripe->pending_io)=%d" ,atomic_read (&stripe->pending_io));for_each_set_bit (i, &old_error_bitmap, stripe->nr_sectors) {/* The current sector cannot be merged, submit the bio. */
@@ -1028,7 +1029,7 @@ static void scrub_stripe_report_errors(struct scrub_ctx *sctx,int ret;/* For scrub, our mirror_num should always start at 1. */ -ASSERT (stripe->mirror_num >=1 ); +ASSERT (stripe->mirror_num >=1 ,"stripe->mirror_num=%d" , stripe->mirror_num); ret =btrfs_map_block (fs_info,BTRFS_MAP_GET_READ_MIRRORS , stripe->logical, &mapped_len, &bioc,NULL ,NULL );
@@ -1168,7 +1169,7 @@ static void scrub_stripe_read_repair_worker(struct work_struct *work)int mirror;int i; -ASSERT (stripe->mirror_num >0 ); +ASSERT (stripe->mirror_num >=1 ,"stripe->mirror_num=%d" , stripe->mirror_num);wait_scrub_stripe_io (stripe);scrub_verify_one_stripe (stripe,scrub_bitmap_read_has_extent (stripe));
@@ -1484,7 +1485,7 @@ static int compare_extent_item_range(struct btrfs_path *path,btrfs_item_key_to_cpu (path->nodes[0 ], &key, path->slots[0 ]);ASSERT (key.type ==BTRFS_EXTENT_ITEM_KEY || - key.type ==BTRFS_METADATA_ITEM_KEY ); + key.type ==BTRFS_METADATA_ITEM_KEY ,"key.type=%u" , key.type);if (key.type ==BTRFS_METADATA_ITEM_KEY ) len = fs_info->nodesize;else
@@ -1589,7 +1590,7 @@ static void get_extent_info(struct btrfs_path *path, u64 *extent_start_ret,btrfs_item_key_to_cpu (path->nodes[0 ], &key, path->slots[0 ]);ASSERT (key.type ==BTRFS_METADATA_ITEM_KEY || - key.type ==BTRFS_EXTENT_ITEM_KEY ); + key.type ==BTRFS_EXTENT_ITEM_KEY ,"key.type=%u" , key.type); *extent_start_ret = key.objectid;if (key.type ==BTRFS_METADATA_ITEM_KEY ) *size_ret = path->nodes[0 ]->fs_info->nodesize;
@@ -1687,7 +1688,9 @@ static int scrub_find_fill_first_stripe(struct btrfs_block_group *bg,scrub_stripe_reset_bitmaps (stripe);/* The range must be inside the bg. */ -ASSERT (logical_start >= bg->start && logical_end <= bg->start + bg->length); +ASSERT (logical_start >= bg->start && logical_end <= bg->start + bg->length, +"bg->start=%llu logical_start=%llu logical_end=%llu end=%llu" , + bg->start, logical_start, logical_end, bg->start + bg->length); ret =find_first_extent_item (extent_root, extent_path, logical_start, logical_len);
fs/btrfs/space-info.c +18 -12
@@ -202,7 +202,7 @@ static u64 calc_chunk_size(const struct btrfs_fs_info *fs_info, u64 flags)if (btrfs_is_zoned (fs_info))return fs_info->zone_size; -ASSERT (flags &BTRFS_BLOCK_GROUP_TYPE_MASK ); +ASSERT (flags &BTRFS_BLOCK_GROUP_TYPE_MASK ,"flags=%llu" , flags);if (flags &BTRFS_BLOCK_GROUP_DATA )return BTRFS_MAX_DATA_CHUNK_SIZE ;
@@ -253,8 +253,9 @@ static int create_space_info_sub_group(struct btrfs_space_info *parent, u64 flagstruct btrfs_space_info *sub_group;int ret; -ASSERT (parent->subgroup_id ==BTRFS_SUB_GROUP_PRIMARY ); -ASSERT (id !=BTRFS_SUB_GROUP_PRIMARY ); +ASSERT (parent->subgroup_id ==BTRFS_SUB_GROUP_PRIMARY , +"parent->subgroup_id=%d" , parent->subgroup_id); +ASSERT (id !=BTRFS_SUB_GROUP_PRIMARY ,"id=%d" , id); sub_group =kzalloc (sizeof (*sub_group),GFP_NOFS );if (!sub_group)
@@ -522,7 +523,9 @@ static void remove_ticket(struct btrfs_space_info *space_info,if (!list_empty (&ticket->list)) {list_del_init (&ticket->list); -ASSERT (space_info->reclaim_size >= ticket->bytes); +ASSERT (space_info->reclaim_size >= ticket->bytes, +"space_info->reclaim_size=%llu ticket->bytes=%llu" , + space_info->reclaim_size, ticket->bytes); space_info->reclaim_size -= ticket->bytes; }
@@ -1662,7 +1665,7 @@ static int handle_reserve_ticket(struct btrfs_space_info *space_info,priority_reclaim_data_space (space_info, ticket);break ;default : -ASSERT (0 ); +ASSERT (0 ,"flush=%d" , flush);break ; }
@@ -1674,7 +1677,8 @@ static int handle_reserve_ticket(struct btrfs_space_info *space_info,* releasing reserved space (if an error happens the expectation is that * space wasn't reserved at all). */ -ASSERT (!(ticket->bytes ==0 && ticket->error)); +ASSERT (!(ticket->bytes ==0 && ticket->error), +"ticket->bytes=%llu ticket->error=%d" , ticket->bytes, ticket->error);trace_btrfs_reserve_ticket (space_info->fs_info, space_info->flags, orig_bytes, start_ns, flush, ticket->error);return ret;
@@ -1749,7 +1753,7 @@ static int reserve_bytes(struct btrfs_space_info *space_info, u64 orig_bytes,int ret = -ENOSPC ;bool pending_tickets; -ASSERT (orig_bytes); +ASSERT (orig_bytes,"orig_bytes=%llu" , orig_bytes);/* * If have a transaction handle (current->journal_info != NULL), then * the flush method can not be neither BTRFS_RESERVE_FLUSH_ALL* nor
@@ -1758,9 +1762,9 @@ static int reserve_bytes(struct btrfs_space_info *space_info, u64 orig_bytes,*/ if (current->journal_info) {/* One assert per line for easier debugging. */ -ASSERT (flush !=BTRFS_RESERVE_FLUSH_ALL ); -ASSERT (flush !=BTRFS_RESERVE_FLUSH_ALL_STEAL ); -ASSERT (flush !=BTRFS_RESERVE_FLUSH_EVICT ); +ASSERT (flush !=BTRFS_RESERVE_FLUSH_ALL ,"flush=%d" , flush); +ASSERT (flush !=BTRFS_RESERVE_FLUSH_ALL_STEAL ,"flush=%d" , flush); +ASSERT (flush !=BTRFS_RESERVE_FLUSH_EVICT ,"flush=%d" , flush); }if (flush ==BTRFS_RESERVE_FLUSH_DATA )
@@ -1921,8 +1925,10 @@ int btrfs_reserve_data_bytes(struct btrfs_space_info *space_info, u64 bytes,ASSERT (flush ==BTRFS_RESERVE_FLUSH_DATA || flush ==BTRFS_RESERVE_FLUSH_FREE_SPACE_INODE || - flush ==BTRFS_RESERVE_NO_FLUSH ); -ASSERT (!current->journal_info || flush !=BTRFS_RESERVE_FLUSH_DATA ); + flush ==BTRFS_RESERVE_NO_FLUSH ,"flush=%d" , flush); +ASSERT (!current->journal_info || flush !=BTRFS_RESERVE_FLUSH_DATA , +"current->journal_info=0x%lx flush=%d" , + (unsigned long )current->journal_info, flush); ret =reserve_bytes (space_info, bytes, flush);if (ret == -ENOSPC ) {
fs/btrfs/subpage.c +7 -3
@@ -180,7 +180,7 @@ static void btrfs_subpage_assert(const struct btrfs_fs_info *fs_info,/* Basic checks */ ASSERT (folio_test_private (folio) &&folio_get_private (folio));ASSERT (IS_ALIGNED (start, fs_info->sectorsize) && -IS_ALIGNED (len, fs_info->sectorsize)); +IS_ALIGNED (len, fs_info->sectorsize),"start=%llu len=%u" , start, len);/* * The range check only works for mapped page, we can still have * unmapped page like dummy extent buffer pages.
@@ -249,7 +249,9 @@ static bool btrfs_subpage_end_and_test_lock(const struct btrfs_fs_info *fs_info,clear_bit (bit, bfs->bitmaps); cleared++; } -ASSERT (atomic_read (&bfs->nr_locked) >= cleared); +ASSERT (atomic_read (&bfs->nr_locked) >= cleared, +"atomic_read(&bfs->nr_locked)=%d cleared=%d" , +atomic_read (&bfs->nr_locked), cleared); last =atomic_sub_and_test (cleared, &bfs->nr_locked);spin_unlock_irqrestore (&bfs->lock, flags);return last;
@@ -328,7 +330,9 @@ void btrfs_folio_end_lock_bitmap(const struct btrfs_fs_info *fs_info,if (test_and_clear_bit (bit + start_bit, bfs->bitmaps)) cleared++; } -ASSERT (atomic_read (&bfs->nr_locked) >= cleared); +ASSERT (atomic_read (&bfs->nr_locked) >= cleared, +"atomic_read(&bfs->nr_locked)=%d cleared=%d" , +atomic_read (&bfs->nr_locked), cleared); last =atomic_sub_and_test (cleared, &bfs->nr_locked);spin_unlock_irqrestore (&bfs->lock, flags);if (last)
fs/btrfs/transaction.c +29 -12
93 lines not on this page · raw message
fs/btrfs/tree-checker.c +1 -1
@@ -186,7 +186,7 @@ static bool check_prev_ino(struct extent_buffer *leaf, key->type ==BTRFS_INODE_EXTREF_KEY || key->type ==BTRFS_DIR_INDEX_KEY || key->type ==BTRFS_DIR_ITEM_KEY || - key->type == BTRFS_EXTENT_DATA_KEY); + key->type == BTRFS_EXTENT_DATA_KEY, "key->type=%u", key->type);/* * Only subvolume trees along with their reloc trees need this check.
fs/btrfs/tree-log.c +31 -15
136 lines not on this page · raw message
fs/btrfs/zoned.c +23 -14
@@ -93,7 +93,8 @@ static int sb_write_pointer(struct block_device *bdev, struct blk_zone *zones,sector_t sector;for (int i =0 ; i <BTRFS_NR_SB_LOG_ZONES ; i++) { -ASSERT (zones[i].type !=BLK_ZONE_TYPE_CONVENTIONAL ); +ASSERT (zones[i].type !=BLK_ZONE_TYPE_CONVENTIONAL , +"zones[%d].type=%d" , i, zones[i].type); empty[i] = (zones[i].cond ==BLK_ZONE_COND_EMPTY ); full[i] =sb_zone_is_full (&zones[i]); }
@@ -166,14 +167,14 @@ static inline u32 sb_zone_number(int shift, int mirror) {u64 zone =U64_MAX ; -ASSERT (mirror <BTRFS_SUPER_MIRROR_MAX ); +ASSERT (mirror <BTRFS_SUPER_MIRROR_MAX ,"mirror=%d" , mirror);switch (mirror) {case 0 : zone =0 ;break ;case 1 : zone =1ULL << (BTRFS_SB_LOG_FIRST_SHIFT - shift);break ;case 2 : zone =1ULL << (BTRFS_SB_LOG_SECOND_SHIFT - shift);break ; } -ASSERT (zone <=U32_MAX ); +ASSERT (zone <=U32_MAX ,"zone=%llu" , zone);return (u32 )zone; }
@@ -240,7 +241,8 @@ static int btrfs_get_dev_zones(struct btrfs_device *device, u64 pos,unsigned int i;u32 zno; -ASSERT (IS_ALIGNED (pos, zinfo->zone_size)); +ASSERT (IS_ALIGNED (pos, zinfo->zone_size), +"pos=%llu zinfo->zone_size=%llu" , pos, zinfo->zone_size); zno = pos >> zinfo->zone_size_shift;/* * We cannot report zones beyond the zone end. So, it is OK to
@@ -1055,8 +1057,10 @@ u64 btrfs_find_allocatable_zones(struct btrfs_device *device, u64 hole_start,bool have_sb;int i; -ASSERT (IS_ALIGNED (hole_start, zinfo->zone_size)); -ASSERT (IS_ALIGNED (num_bytes, zinfo->zone_size)); +ASSERT (IS_ALIGNED (hole_start, zinfo->zone_size), +"hole_start=%llu zinfo->zone_size=%llu" , hole_start, zinfo->zone_size); +ASSERT (IS_ALIGNED (num_bytes, zinfo->zone_size), +"num_bytes=%llu zinfo->zone_size=%llu" , num_bytes, zinfo->zone_size);while (pos < hole_end) { begin = pos >> shift;
@@ -1172,8 +1176,10 @@ int btrfs_ensure_empty_zones(struct btrfs_device *device, u64 start, u64 size)u64 pos;int ret; -ASSERT (IS_ALIGNED (start, zinfo->zone_size)); -ASSERT (IS_ALIGNED (size, zinfo->zone_size)); +ASSERT (IS_ALIGNED (start, zinfo->zone_size), +"start=%llu, zinfo->zone_size=%llu" , start, zinfo->zone_size); +ASSERT (IS_ALIGNED (size, zinfo->zone_size), +"size=%llu, zinfo->zone_size=%llu" , size, zinfo->zone_size);if (begin + nbits > zinfo->nr_zones)return -ERANGE ;
@@ -1866,7 +1872,7 @@ static void btrfs_rewrite_logical_zoned(struct btrfs_ordered_extent *ordered, em =btrfs_search_extent_mapping (em_tree, ordered->file_offset, ordered->num_bytes);/* The em should be a new COW extent, thus it should not have an offset. */ -ASSERT (em->offset ==0 ); +ASSERT (em->offset ==0 ,"em->offset=%llu" , em->offset); em->disk_bytenr = logical;btrfs_free_extent_map (em);write_unlock (&em_tree->lock);
@@ -2577,7 +2583,8 @@ void btrfs_zoned_reserve_data_reloc_bg(struct btrfs_fs_info *fs_info)struct btrfs_space_info *reloc_sinfo = data_sinfo->sub_group[0 ];int factor; -ASSERT (reloc_sinfo->subgroup_id ==BTRFS_SUB_GROUP_DATA_RELOC ); +ASSERT (reloc_sinfo->subgroup_id ==BTRFS_SUB_GROUP_DATA_RELOC , +"reloc_sinfo->subgroup_id=%d" , reloc_sinfo->subgroup_id); factor =btrfs_bg_type_to_factor (bg->flags);down_write (&space_info->groups_sem);
@@ -2591,9 +2598,9 @@ void btrfs_zoned_reserve_data_reloc_bg(struct btrfs_fs_info *fs_info) space_info->disk_total -= bg->length * factor; space_info->disk_total -= bg->zone_unusable;/* There is no allocation ever happened. */ -ASSERT (bg->used ==0 ); +ASSERT (bg->used ==0 ,"bg->used=%llu" , bg->used);/* No super block in a block group on the zoned setup. */ -ASSERT (bg->bytes_super ==0 ); +ASSERT (bg->bytes_super ==0 ,"bg->bytes_super=%llu" , bg->bytes_super);spin_unlock (&space_info->lock); bg->space_info = reloc_sinfo;
@@ -2619,7 +2626,8 @@ void btrfs_zoned_reserve_data_reloc_bg(struct btrfs_fs_info *fs_info)/* Allocate new BG in the data relocation space_info. */ space_info = data_sinfo->sub_group[0 ]; -ASSERT (space_info->subgroup_id ==BTRFS_SUB_GROUP_DATA_RELOC ); +ASSERT (space_info->subgroup_id ==BTRFS_SUB_GROUP_DATA_RELOC , +"space_info->subgroup_id=%d" , space_info->subgroup_id); ret =btrfs_chunk_alloc (trans, space_info, alloc_flags,CHUNK_ALLOC_FORCE );btrfs_end_transaction (trans);if (ret ==1 ) {
@@ -2960,7 +2968,8 @@ int btrfs_reset_unused_block_groups(struct btrfs_space_info *space_info, u64 num* This holds because we currently reset fully used then freed * block group. */ -ASSERT (reclaimed == bg->zone_capacity); +ASSERT (reclaimed == bg->zone_capacity, +"reclaimed=%llu bg->zone_capacity=%llu" , reclaimed, bg->zone_capacity); bg->free_space_ctl->free_space += reclaimed; space_info->bytes_zone_unusable -= reclaimed;spin_unlock (&bg->lock);
Signature · 1 line
2.51.1