diff options
author | Jaegeuk Kim <jaegeuk@kernel.org> | 2015-12-15 11:13:25 -0800 |
---|---|---|
committer | Steve Kondik <steve@cyngn.com> | 2016-08-24 11:43:29 -0700 |
commit | 94a04b1832c455810bc547f9993fd66200ee1c30 (patch) | |
tree | cb21d0e17fbbabf50378ac7d82a05e87898369e9 /lib | |
parent | 4455742a374ccd84a8981444442030edfaa44f6d (diff) | |
download | android_external_f2fs-tools-94a04b1832c455810bc547f9993fd66200ee1c30.tar.gz android_external_f2fs-tools-94a04b1832c455810bc547f9993fd66200ee1c30.tar.bz2 android_external_f2fs-tools-94a04b1832c455810bc547f9993fd66200ee1c30.zip |
lib: use u8/u32/u64 for bit operations
This cleans up the bit operations.
Change-Id: Ie2b303cc6eddc4ef5315f8f55616dbe182664ddc
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r-- | lib/libf2fs.c | 19 |
1 files changed, 8 insertions, 11 deletions
diff --git a/lib/libf2fs.c b/lib/libf2fs.c index b90e729..8158514 100644 --- a/lib/libf2fs.c +++ b/lib/libf2fs.c @@ -236,7 +236,7 @@ int get_bits_in_byte(unsigned char n) return bits_in_byte[n]; } -int test_and_set_bit_le(unsigned int nr, unsigned char *addr) +int test_and_set_bit_le(u32 nr, u8 *addr) { int mask, retval; @@ -247,7 +247,7 @@ int test_and_set_bit_le(unsigned int nr, unsigned char *addr) return retval; } -int test_and_clear_bit_le(unsigned int nr, unsigned char *addr) +int test_and_clear_bit_le(u32 nr, u8 *addr) { int mask, retval; @@ -258,7 +258,7 @@ int test_and_clear_bit_le(unsigned int nr, unsigned char *addr) return retval; } -int test_bit_le(unsigned int nr, const unsigned char *addr) +int test_bit_le(u32 nr, const u8 *addr) { return ((1 << (nr & 7)) & (addr[nr >> 3])); } @@ -297,7 +297,7 @@ int f2fs_clear_bit(unsigned int nr, char *addr) return ret; } -static inline unsigned long __ffs(unsigned char word) +static inline u64 __ffs(u8 word) { int num = 0; @@ -317,10 +317,9 @@ static inline unsigned long __ffs(unsigned char word) /* Copied from linux/lib/find_bit.c */ #define BITMAP_FIRST_BYTE_MASK(start) (0xff << ((start) & (BITS_PER_BYTE - 1))) -static unsigned long _find_next_bit_le(const unsigned char *addr, - unsigned long nbits, unsigned long start, char invert) +static u64 _find_next_bit_le(const u8 *addr, u64 nbits, u64 start, char invert) { - unsigned char tmp; + u8 tmp; if (!nbits || start >= nbits) return nbits; @@ -342,15 +341,13 @@ static unsigned long _find_next_bit_le(const unsigned char *addr, return min(start + __ffs(tmp), nbits); } -unsigned long find_next_bit_le(const unsigned char *addr, unsigned long size, - unsigned long offset) +u64 find_next_bit_le(const u8 *addr, u64 size, u64 offset) { return _find_next_bit_le(addr, size, offset, 0); } -unsigned long find_next_zero_bit_le(const unsigned char *addr, - unsigned long size, unsigned long offset) +u64 find_next_zero_bit_le(const u8 *addr, u64 size, u64 offset) { return _find_next_bit_le(addr, size, offset, 0xff); } |