diff options
| author | Rosen Penev <rosenp@gmail.com> | 2018-11-05 11:06:41 -0800 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2018-11-13 13:20:41 +0100 |
| commit | ed570e2df335063280c9d3affd8bb89919a1ac0d (patch) | |
| tree | 23b85a08b725dc673f37f8da6de4d30c1fbf5b97 | |
| parent | d72d913291683188ddf5d758db02f1bc3b05d2f7 (diff) | |
btrfs-progs: kernel-lib: bitops: Fix big endian compilation
Replaced bswap with _ variants bswap_32 etc. While it's a glibc
extension, all of the popular libc implementations (glibc, uClibc, musl,
BIONIC) seem to support it.
Added static inline to two functions to match little endian variants. This
fixes a linking error experienced when compiling on gcc 7.3.0 with LTO,
possibly a bug that was fixed later.
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Signed-off-by: Rosen Penev <rosenp@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | kernel-lib/bitops.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/kernel-lib/bitops.h b/kernel-lib/bitops.h index b1fd6f53..2c51a265 100644 --- a/kernel-lib/bitops.h +++ b/kernel-lib/bitops.h @@ -178,9 +178,9 @@ static inline unsigned long find_next_zero_bit(const unsigned long *addr, static inline unsigned long ext2_swab(const unsigned long y) { #if BITS_PER_LONG == 64 - return (unsigned long) bswap64((u64) y); + return (unsigned long) bswap_64((u64) y); #elif BITS_PER_LONG == 32 - return (unsigned long) bswap32((u32) y); + return (unsigned long) bswap_32((u32) y); #else #error BITS_PER_LONG not defined #endif @@ -218,14 +218,14 @@ static inline unsigned long _find_next_bit_le(const unsigned long *addr1, return min(start + __ffs(ext2_swab(tmp)), nbits); } -unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, +static inline unsigned long find_next_zero_bit_le(const void *addr, unsigned long size, unsigned long offset) { return _find_next_bit_le(addr, NULL, size, offset, ~0UL); } -unsigned long find_next_bit_le(const void *addr, unsigned long size, +static inline unsigned long find_next_bit_le(const void *addr, unsigned long size, unsigned long offset) { return _find_next_bit_le(addr, NULL, size, offset, 0UL); |