btrfs: Replace const_ilog2() with ilog2()
PATCH 1/1 btrfs: Replace const_ilog2() with ilog2()
const_ilog2() was a workaround of some sparse issue, which was never appeared in the C functions. Replace it with ilog2().
Signed-off-by Andy Shevchenko <[email protected]>
--- fs/btrfs/volumes.h | 5 ++--- fs/btrfs/zoned.c | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-)
fs/btrfs/volumes.h +2 -3
@@ -45,7 +45,7 @@ extern struct mutex uuid_mutex;#define BTRFS_STRIPE_LEN_SHIFT (16)#define BTRFS_STRIPE_LEN_MASK (BTRFS_STRIPE_LEN - 1) -static_assert (const_ilog2 (BTRFS_STRIPE_LEN ) ==BTRFS_STRIPE_LEN_SHIFT ); +static_assert (ilog2 (BTRFS_STRIPE_LEN ) ==BTRFS_STRIPE_LEN_SHIFT );/* Used by sanity check for btrfs_raid_types. */ #define const_ffs (n) (__builtin_ctzll(n) + 1)
@@ -58,8 +58,7 @@ static_assert(const_ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);*/ static_assert (const_ffs (BTRFS_BLOCK_GROUP_RAID0 ) <const_ffs (BTRFS_BLOCK_GROUP_PROFILE_MASK & ~BTRFS_BLOCK_GROUP_RAID0 )); -static_assert (const_ilog2 (BTRFS_BLOCK_GROUP_RAID0 ) > -ilog2 (BTRFS_BLOCK_GROUP_TYPE_MASK )); +static_assert (ilog2 (BTRFS_BLOCK_GROUP_RAID0 ) >ilog2 (BTRFS_BLOCK_GROUP_TYPE_MASK ));/* ilog2() can handle both constants and variables */ #define BTRFS_BG_FLAG_TO_INDEX (profile) \
fs/btrfs/zoned.c +2 -2
@@ -37,8 +37,8 @@#define BTRFS_SB_LOG_FIRST_OFFSET (512ULL * SZ_1G)#define BTRFS_SB_LOG_SECOND_OFFSET (4096ULL * SZ_1G) -#define BTRFS_SB_LOG_FIRST_SHIFT const_ilog2(BTRFS_SB_LOG_FIRST_OFFSET) -#define BTRFS_SB_LOG_SECOND_SHIFT const_ilog2(BTRFS_SB_LOG_SECOND_OFFSET) +#define BTRFS_SB_LOG_FIRST_SHIFT ilog2(BTRFS_SB_LOG_FIRST_OFFSET) +#define BTRFS_SB_LOG_SECOND_SHIFT ilog2(BTRFS_SB_LOG_SECOND_OFFSET)/* Number of superblock log zones */ #define BTRFS_NR_SB_LOG_ZONES 2
Signature · 1 line
2.50.1
Quoted 4 lines · Andy Shevchenko
const_ilog2()was a workaround of some sparse issue, which was never appeared in the C functions. Replace it withilog2().Signed-off-by Andy Shevchenko <[email protected]>
Added to for-next, thanks.