Introduce ext4_find_next_bit

I would like feedback on the arm, m68k and s390. I haven't compile tested this on these archs

-aneesh

Introduce ext4_find_next_bit

From: Aneesh Kumar K.V <[email protected]>

This gets used by the ext4 multi block allocator patches.

Also add generic_find_next_le_bit

---

include/asm-arm/bitops.h                     |    2 +
include/asm-generic/bitops/ext2-non-atomic.h |    2 +
include/asm-generic/bitops/le.h              |    4 ++
include/asm-m68k/bitops.h                    |    2 +
include/asm-m68knommu/bitops.h               |    2 +
include/asm-powerpc/bitops.h                 |    4 ++
include/asm-s390/bitops.h                    |    2 +
include/linux/ext4_fs.h                      |    1 +
lib/find_next_bit.c                          |   44 ++++++++++++++++++++++++++
9 files changed, 63 insertions(+), 0 deletions(-)

index 47a6b08..5c60bfc 100644
@@ -310,6 +310,8 @@ static inline int constant_fls(int x)

		_find_first_zero_bit_le(p,sz)
#define ext2_find_next_zero_bit(p,sz,off)	\
		_find_next_zero_bit_le(p,sz,off)

+#define ext2_find_next_bit(p, sz, off) \
+ _find_next_bit_le(p, sz, off)

/*
* Minix is defined to use little-endian byte ordering.

index 1697404..63cf822 100644
@@ -14,5 +14,7 @@

generic_find_first_zero_le_bit((unsigned long *)(addr), (size))

#define ext2_find_next_zero_bit(addr, size, off) \
	generic_find_next_zero_le_bit((unsigned long *)(addr), (size), (off))

+#define ext2_find_next_bit(addr, size, off) \
+ generic_find_next_le_bit((unsigned long *)(addr), (size), (off))

#endif /* _ASM_GENERIC_BITOPS_EXT2_NON_ATOMIC_H_ */

index b9c7e5d..80e3bf1 100644
@@ -20,6 +20,8 @@

#define generic___test_and_clear_le_bit(nr, addr) __test_and_clear_bit(nr, addr)

#define generic_find_next_zero_le_bit(addr, size, offset) find_next_zero_bit(addr, size, offset) +#define generic_find_next_le_bit(addr, size, offset) \
+ find_next_bit(addr, size, offset)

#elif defined(__BIG_ENDIAN)

@@ -42,6 +44,8 @@

extern unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,

		unsigned long size, unsigned long offset);

+extern unsigned long generic_find_next_le_bit(const unsigned long *addr,
+ unsigned long size, unsigned long offset);

#else
#error "Please fix <asm/byteorder.h>"

index 2976b5d..83d1f28 100644
@@ -410,6 +410,8 @@ static inline int ext2_find_next_zero_bit(const void *vaddr, unsigned size,

	res = ext2_find_first_zero_bit (p, size - 32 * (p - addr));
	return (p - addr) * 32 + res;
}

+#define ext2_find_next_bit(addr, size, off) \
+ generic_find_next_le_bit((unsigned long *)(addr), (size), (off))

#endif /* __KERNEL__ */

index f8dfb7b..f43afe1 100644
@@ -294,6 +294,8 @@ found_middle:

	return result + ffz(__swab32(tmp));
}

+#define ext2_find_next_bit(addr, size, off) \
+ generic_find_next_le_bit((unsigned long *)(addr), (size), (off))
#include <asm-generic/bitops/minix.h>

#endif /* __KERNEL__ */

index 733b4af..220d9a7 100644
@@ -359,6 +359,8 @@ static __inline__ int test_le_bit(unsigned long nr,

unsigned long generic_find_next_zero_le_bit(const unsigned long *addr,

				    unsigned long size, unsigned long offset);

+unsigned long generic_find_next_le_bit(const unsigned long *addr,
+ unsigned long size, unsigned long offset);
/* Bitmap functions for the ext2 filesystem */

#define ext2_set_bit(nr,addr) \
@@ -378,6 +380,8 @@ unsigned long generic_find_next_zero_le_bit(const unsigned long *addr, #define ext2_find_next_zero_bit(addr, size, off) \
generic_find_next_zero_le_bit((unsigned long*)addr, size, off)

+#define ext2_find_next_bit(addr, size, off) \
+ generic_find_next_le_bit((unsigned long *)addr, size, off)
/* Bitmap functions for the minix filesystem. */

#define minix_test_and_set_bit(nr,addr) \

index 34d9a63..dba6fec 100644
@@ -772,6 +772,8 @@ static inline int sched_find_first_bit(unsigned long *b)

	test_and_clear_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)
#define ext2_test_bit(nr, addr)      \
	test_bit((nr)^(__BITOPS_WORDSIZE - 8), (unsigned long *)addr)

+#define ext2_find_next_bit(addr, size, off) \
+ generic_find_next_le_bit((unsigned long *)(addr), (size), (off))

#ifndef __s390x__

index e8b323e..daa5b26 100644
@@ -493,6 +493,7 @@ do {									       \

#define ext4_test_bit ext2_test_bit
#define ext4_find_first_zero_bit ext2_find_first_zero_bit
#define ext4_find_next_zero_bit ext2_find_next_zero_bit
+#define ext4_find_next_bit ext2_find_next_bit

/*
* Maximal mount counts between two filesystem checks

index bda0d71..0306c04 100644
@@ -178,4 +178,48 @@ found_middle_swap:
 

EXPORT_SYMBOL(generic_find_next_zero_le_bit);

+unsigned long generic_find_next_le_bit(const unsigned long *addr, unsigned
+ long size, unsigned long offset)
+{
+ const unsigned long *p = addr + BITOP_WORD(offset);
+ unsigned long result = offset & ~(BITS_PER_LONG - 1);
+ unsigned long tmp;
+
+ if (offset >= size)
+ return size;
+ size -= result;
+ offset &= (BITS_PER_LONG - 1UL);
+ if (offset) {
+ tmp = ext2_swabp(p++);
+ tmp &= (~0UL << offset);
+ if (size < BITS_PER_LONG)
+ goto found_first;
+ if (tmp)
+ goto found_middle;
+ size -= BITS_PER_LONG;
+ result += BITS_PER_LONG;
+ }
+
+ while (size & ~(BITS_PER_LONG - 1)) {
+ tmp = *(p++);
+ if (tmp)
+ goto found_middle_swap;
+ result += BITS_PER_LONG;
+ size -= BITS_PER_LONG;
+ }
+ if (!size)
+ return result;
+ tmp = ext2_swabp(p);
+found_first:
+ tmp &= (~0UL >> (BITS_PER_LONG - size));
+ if (tmp == 0UL) /* Are any bits set? */
+ return result + size; /* Nope. */
+found_middle:
+ return result + __ffs(tmp);
+
+found_middle_swap:
+ return result + __ffs(ext2_swab(tmp));
+}
+EXPORT_SYMBOL(generic_find_next_le_bit);
+
#endif /* __BIG_ENDIAN */