Gh0st
/
linux
mirror of https://github.com/torvalds/linux.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

btrfs: don't generate any code from ASSERT() in release builds 

The current definition of ASSERT(cond) as (void)(cond) is redundant,
since these checks have no side effects and don't affect code logic.

However, some checks contain READ_ONCE() or other compiler-unfriendly
constructs. For example, ASSERT(list_empty) in btrfs_add_dealloc_inode()
was compiled to a redundant mov instruction due to this issue.

Define ASSERT as BUILD_BUG_ON_INVALID for !CONFIG_BTRFS_ASSERT builds
which uses sizeof(cond) trick.  Also mark full_page_sectors_uptodate()
as __maybe_unused to suppress "unneeded declaration" warning (it's
needed in compile time)

Signed-off-by: Gladyshev Ilya <foxido@foxido.dev>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
This commit is contained in:
Gladyshev Ilya 2025-11-02 10:38:52 +03:00 committed by David Sterba
parent dd57c78aec
commit 1dac8db80c
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/btrfs/messages.h
View File

@ -168,7 +168,8 @@ do { \
#endif #endif
#else #else
#define ASSERT(cond, args...) (void)(cond) /* Compile check the @cond expression but don't generate any code. */
#define ASSERT(cond, args...) BUILD_BUG_ON_INVALID(cond)
#endif #endif
#ifdef CONFIG_BTRFS_DEBUG #ifdef CONFIG_BTRFS_DEBUG

4
fs/btrfs/raid56.c
View File

@ -299,8 +299,8 @@ static int rbio_bucket(struct btrfs_raid_bio *rbio)
return hash_64(num >> 16, BTRFS_STRIPE_HASH_TABLE_BITS); return hash_64(num >> 16, BTRFS_STRIPE_HASH_TABLE_BITS);
} }
static bool full_page_sectors_uptodate(struct btrfs_raid_bio *rbio, static __maybe_unused bool full_page_sectors_uptodate(struct btrfs_raid_bio *rbio,
unsigned int page_nr) unsigned int page_nr)
{ {
const u32 sectorsize = rbio->bioc->fs_info->sectorsize; const u32 sectorsize = rbio->bioc->fs_info->sectorsize;
const u32 sectors_per_page = PAGE_SIZE / sectorsize; const u32 sectors_per_page = PAGE_SIZE / sectorsize;