LU-1346 libcfs: replace libcfs wrappers with kernel API

[fs/lustre-release.git] / libcfs / include / libcfs / user-bitops.h

diff --git a/libcfs/include/libcfs/user-bitops.h b/libcfs/include/libcfs/user-bitops.h
index 3e667f1..51aba34 100644 (file)
--- a/libcfs/include/libcfs/user-bitops.h
+++ b/libcfs/include/libcfs/user-bitops.h
@@ -40,7 +40,7 @@
 #define __LIBCFS_USER_BITOPS_H__
 
 /* test if bit nr is set in bitmap addr; returns previous value of bit nr */
-static __inline__ int cfs_test_and_set_bit(int nr, unsigned long *addr)
+static inline int test_and_set_bit(int nr, unsigned long *addr)
 {
         unsigned long mask;
 
@@ -51,10 +51,10 @@ static __inline__ int cfs_test_and_set_bit(int nr, unsigned long *addr)
         return nr;
 }
 
-#define cfs_set_bit(n, a) cfs_test_and_set_bit(n, a)
+#define set_bit(n, a) test_and_set_bit(n, a)
 
 /* clear bit nr in bitmap addr; returns previous value of bit nr*/
-static __inline__ int cfs_test_and_clear_bit(int nr, unsigned long *addr)
+static inline int test_and_clear_bit(int nr, unsigned long *addr)
 {
         unsigned long mask;
 
@@ -65,9 +65,9 @@ static __inline__ int cfs_test_and_clear_bit(int nr, unsigned long *addr)
         return nr;
 }
 
-#define cfs_clear_bit(n, a) cfs_test_and_clear_bit(n, a)
+#define clear_bit(n, a) test_and_clear_bit(n, a)
 
-static __inline__ int cfs_test_bit(int nr, const unsigned long *addr)
+static inline int test_bit(int nr, const unsigned long *addr)
 {
         return ((1UL << (nr & (BITS_PER_LONG - 1))) &
                 ((addr)[nr / BITS_PER_LONG])) != 0;
@@ -148,14 +148,13 @@ static __inline__ unsigned long __cfs_ffs(long data)
 #define __cfs_ffz(x)   __cfs_ffs(~(x))
 #define __cfs_flz(x)   __cfs_fls(~(x))
 
-unsigned long cfs_find_next_bit(unsigned long *addr,
-                                unsigned long size, unsigned long offset);
+unsigned long find_next_bit(unsigned long *addr,
+                           unsigned long size, unsigned long offset);
 
-unsigned long cfs_find_next_zero_bit(unsigned long *addr,
-                                     unsigned long size, unsigned long offset);
+unsigned long find_next_zero_bit(unsigned long *addr,
+                                unsigned long size, unsigned long offset);
 
-#define cfs_find_first_bit(addr,size)     (cfs_find_next_bit((addr),(size),0))
-#define cfs_find_first_zero_bit(addr,size)  \
-        (cfs_find_next_zero_bit((addr),(size),0))
+#define find_first_bit(addr, size)       find_next_bit((addr), (size),0)
+#define find_first_zero_bit(addr, size)  find_next_zero_bit((addr), (size),0)
 
 #endif