Skip to content

Commit cb68c9c

Browse files
andy-shevkdave
authored andcommitted
btrfs: replace const_ilog2() with ilog2()
const_ilog2() was a workaround of some sparse issue, which has never appeared in the C functions. Replace it with ilog2(). Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com> Reviewed-by: David Sterba <dsterba@suse.com> Signed-off-by: David Sterba <dsterba@suse.com>
1 parent aeaa49d commit cb68c9c

File tree

2 files changed

+4
-5
lines changed

2 files changed

+4
-5
lines changed

fs/btrfs/volumes.h

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ extern struct mutex uuid_mutex;
4545
#define BTRFS_STRIPE_LEN_SHIFT (16)
4646
#define BTRFS_STRIPE_LEN_MASK (BTRFS_STRIPE_LEN - 1)
4747

48-
static_assert(const_ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);
48+
static_assert(ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);
4949

5050
/* Used by sanity check for btrfs_raid_types. */
5151
#define const_ffs(n) (__builtin_ctzll(n) + 1)
@@ -58,8 +58,7 @@ static_assert(const_ilog2(BTRFS_STRIPE_LEN) == BTRFS_STRIPE_LEN_SHIFT);
5858
*/
5959
static_assert(const_ffs(BTRFS_BLOCK_GROUP_RAID0) <
6060
const_ffs(BTRFS_BLOCK_GROUP_PROFILE_MASK & ~BTRFS_BLOCK_GROUP_RAID0));
61-
static_assert(const_ilog2(BTRFS_BLOCK_GROUP_RAID0) >
62-
ilog2(BTRFS_BLOCK_GROUP_TYPE_MASK));
61+
static_assert(ilog2(BTRFS_BLOCK_GROUP_RAID0) > ilog2(BTRFS_BLOCK_GROUP_TYPE_MASK));
6362

6463
/* ilog2() can handle both constants and variables */
6564
#define BTRFS_BG_FLAG_TO_INDEX(profile) \

fs/btrfs/zoned.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,8 @@
3737
#define BTRFS_SB_LOG_FIRST_OFFSET (512ULL * SZ_1G)
3838
#define BTRFS_SB_LOG_SECOND_OFFSET (4096ULL * SZ_1G)
3939

40-
#define BTRFS_SB_LOG_FIRST_SHIFT const_ilog2(BTRFS_SB_LOG_FIRST_OFFSET)
41-
#define BTRFS_SB_LOG_SECOND_SHIFT const_ilog2(BTRFS_SB_LOG_SECOND_OFFSET)
40+
#define BTRFS_SB_LOG_FIRST_SHIFT ilog2(BTRFS_SB_LOG_FIRST_OFFSET)
41+
#define BTRFS_SB_LOG_SECOND_SHIFT ilog2(BTRFS_SB_LOG_SECOND_OFFSET)
4242

4343
/* Number of superblock log zones */
4444
#define BTRFS_NR_SB_LOG_ZONES 2

0 commit comments

Comments
 (0)