|
@@ -365,6 +365,10 @@ static inline int minix_test_bit(int nr, const void *vaddr)
|
|
#define ext2_set_bit_atomic(lock, nr, addr) test_and_set_bit((nr) ^ 24, (unsigned long *)(addr))
|
|
#define ext2_set_bit_atomic(lock, nr, addr) test_and_set_bit((nr) ^ 24, (unsigned long *)(addr))
|
|
#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
|
|
#define ext2_clear_bit(nr, addr) __test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
|
|
#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
|
|
#define ext2_clear_bit_atomic(lock, nr, addr) test_and_clear_bit((nr) ^ 24, (unsigned long *)(addr))
|
|
|
|
+#define ext2_find_next_zero_bit(addr, size, offset) \
|
|
|
|
+ generic_find_next_zero_le_bit((unsigned long *)addr, size, offset)
|
|
|
|
+#define ext2_find_next_bit(addr, size, offset) \
|
|
|
|
+ generic_find_next_le_bit((unsigned long *)addr, size, offset)
|
|
|
|
|
|
static inline int ext2_test_bit(int nr, const void *vaddr)
|
|
static inline int ext2_test_bit(int nr, const void *vaddr)
|
|
{
|
|
{
|
|
@@ -394,10 +398,9 @@ static inline int ext2_find_first_zero_bit(const void *vaddr, unsigned size)
|
|
return (p - addr) * 32 + res;
|
|
return (p - addr) * 32 + res;
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,
|
|
|
|
- unsigned offset)
|
|
|
|
|
|
+static inline unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,
|
|
|
|
+ unsigned long size, unsigned long offset)
|
|
{
|
|
{
|
|
- const unsigned long *addr = vaddr;
|
|
|
|
const unsigned long *p = addr + (offset >> 5);
|
|
const unsigned long *p = addr + (offset >> 5);
|
|
int bit = offset & 31UL, res;
|
|
int bit = offset & 31UL, res;
|
|
|
|
|
|
@@ -437,10 +440,9 @@ static inline int ext2_find_first_bit(const void *vaddr, unsigned size)
|
|
return (p - addr) * 32 + res;
|
|
return (p - addr) * 32 + res;
|
|
}
|
|
}
|
|
|
|
|
|
-static inline int ext2_find_next_bit(const void *vaddr, unsigned size,
|
|
|
|
- unsigned offset)
|
|
|
|
|
|
+static inline unsigned long generic_find_next_le_bit(const unsigned long *addr,
|
|
|
|
+ unsigned long size, unsigned long offset)
|
|
{
|
|
{
|
|
- const unsigned long *addr = vaddr;
|
|
|
|
const unsigned long *p = addr + (offset >> 5);
|
|
const unsigned long *p = addr + (offset >> 5);
|
|
int bit = offset & 31UL, res;
|
|
int bit = offset & 31UL, res;
|
|
|
|
|