Bit helpers cleanup
David Sterba
maintainercover Bit helpers cleanup
Depends on patch "btrfs: fix balance convert to single on 32-bit host CPUs" that's now in misc-next and cleans up the helpers as discussed at
https://lore.kernel.org/linux-btrfs/[email protected]/
David Sterba (2):
btrfs: add 64bit safe helper for power of two checks
btrfs: use has_single_bit_set for clarity
fs/btrfs/misc.h | 11 +++++++++++ fs/btrfs/tree-checker.c | 14 +++++++------- fs/btrfs/volumes.c | 7 +------ 3 files changed, 19 insertions(+), 13 deletions(-)
Signature · 1 line
2.23.0
David Sterba
maintainerPATCH 1/2 btrfs: add 64bit safe helper for power of two checks
As is_power_of_two takes unsigned long, it's not safe on 32bit architectures, but we could pass any u64 value in seveal places. Add a separate helper and also an alias that better expresses the purpose for which the helper is used.
--- fs/btrfs/misc.h | 11 +++++++++++ 1 file changed, 11 insertions(+)
fs/btrfs/misc.h +11 -0
@@ -47,4 +47,15 @@ static inline u64 div_factor_fine(u64 num, int factor) return div_u64(num, 100); } +/* Copy of is_power_of_two that is 64bit safe */ +static inline bool is_power_of_two_u64 (u64 n) +{ +return n !=0 && (n & (n -1 )) ==0 ; +} + +static inline bool has_single_bit_set (u64 n) +{ +return is_power_of_two_u64 (n); +} +#endif
Signature · 1 line
2.23.0
David Sterba
maintainerPATCH 2/2 btrfs: use has_single_bit_set for clarity
In reply to David SterbaReplace is_power_of_2 with the helper that is self-documenting and remove the open coded call in alloc_profile_is_valid.
--- fs/btrfs/tree-checker.c | 15 ++++++++------- fs/btrfs/volumes.c | 7 +------ 2 files changed, 9 insertions(+), 13 deletions(-)
fs/btrfs/tree-checker.c +8 -7
@@ -23,6 +23,7 @@#include "disk-io.h" #include "compression.h" #include "volumes.h" +#include "misc.h" /* * Error message should follow the following format:
@@ -630,7 +631,7 @@ int btrfs_check_chunk_valid(struct extent_buffer *leaf,return -EUCLEAN ; } -if (!is_power_of_2 (type &BTRFS_BLOCK_GROUP_PROFILE_MASK ) && +if (!has_single_bit_set (type &BTRFS_BLOCK_GROUP_PROFILE_MASK ) && (type &BTRFS_BLOCK_GROUP_PROFILE_MASK ) !=0 ) { chunk_err(leaf, chunk, logical, "invalid chunk profile flag: 0x%llx, expect 0 or 1 bit set",
@@ -814,11 +815,11 @@ static int check_inode_item(struct extent_buffer *leaf, }/* -* S_IFMT is not bit mapped so we can't completely rely on is_power_of_2, -* but is_power_of_2() can save us from checking FIFO/CHR/DIR/REG. -* Only needs to check BLK, LNK and SOCKS +* S_IFMT is not bit mapped so we can't completely rely on +* is_power_of_2/has_single_bit_set, but it can save us from checking +* FIFO/CHR/DIR/REG. Only needs to check BLK, LNK and SOCKS */ -if (!is_power_of_2 (mode &S_IFMT )) { +if (!has_single_bit_set (mode &S_IFMT )) {if (!S_ISLNK (mode) && !S_ISBLK (mode) && !S_ISSOCK (mode)) { inode_item_err(fs_info, leaf, slot, "invalid mode: has 0%o expect valid S_IF* bit(s)",
@@ -1039,8 +1040,8 @@ static int check_extent_item(struct extent_buffer *leaf, btrfs_super_generation(fs_info->super_copy) + 1);return -EUCLEAN ; } -if (!is_power_of_2 (flags & (BTRFS_EXTENT_FLAG_DATA | -BTRFS_EXTENT_FLAG_TREE_BLOCK ))) { +if (!has_single_bit_set (flags & (BTRFS_EXTENT_FLAG_DATA | +BTRFS_EXTENT_FLAG_TREE_BLOCK ))) { extent_err(leaf, slot, "invalid extent flag, have 0x%llx expect 1 bit set in 0x%llx", flags, BTRFS_EXTENT_FLAG_DATA |
fs/btrfs/volumes.c +1 -6
@@ -3844,12 +3844,7 @@ static int alloc_profile_is_valid(u64 flags, int extended)if (flags ==0 )return !extended;/* "0" is valid for usual profiles */ -/* true if exactly one bit set */ -/* -* Don't use is_power_of_2(unsigned long) because it won't work -* for the single profile (1ULL << 48) on 32-bit CPUs. -*/ -return flags !=0 && (flags & (flags -1 )) ==0 ; +return has_single_bit_set (flags); }static inline int balance_need_close (struct btrfs_fs_info *fs_info)
Signature · 1 line
2.23.0