[Ocfs-tools-commits] manish commits r22 - trunk/libocfs

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-04-27 16:16:37 -0500 (Tue, 27 Apr 2004)
New Revision: 22

Modified:
   trunk/libocfs/libocfs.h
Log:
Let's try #including <asm/bitops.h> directly instead of trying to use
broken compat wrappers


Modified: trunk/libocfs/libocfs.h
===================================================================
--- trunk/libocfs/libocfs.h	2004-04-26 19:47:17 UTC (rev 21)
+++ trunk/libocfs/libocfs.h	2004-04-27 21:16:37 UTC (rev 22)
@@ -106,7 +106,9 @@
 #include <sys/ipc.h>
 #include <sys/sem.h>
 
+#include <asm/bitops.h>
 
+
 /* it sucks, but i have to fake a few types to get by */
 #define INIT_LIST_HEAD(a)	do { } while(0)
 #define list_add_tail(a,b)	do { } while(0)
@@ -309,93 +311,7 @@
 }
 #endif
 
-#ifndef smp_mb__before_clear_bit
-/* bitops (taken from asm-generic) */
 
-static inline void set_bit(int nr, void *addr)
-{
-    unsigned long mask = 1UL << (nr & 0x1f);
-    unsigned long *p = ((unsigned long *)addr) + (nr >> 5);
-
-    *p |= mask;
-}
-
-static inline void clear_bit(int nr, void *addr)
-{
-    unsigned long mask = 1UL << (nr & 0x1f);
-    unsigned long *p = ((unsigned long *)addr) + (nr >> 5);
-
-    *p &= ~mask;
-}
-
-static inline int test_bit(int nr, const void *addr)
-{
-    return (1 & (((const unsigned int *) addr)[nr >> 5] >> (nr & 31))) != 0;
-}
-
-static inline int __test_and_clear_bit(int nr, volatile void *addr)
-{
-    unsigned long mask = 1UL << (nr & 0x1f);
-    unsigned long *p = ((unsigned long *)addr) + (nr >> 5);
-    unsigned long old = *p;
-
-    *p = old & ~mask;
-    return (old & mask) != 0;
-}
-
-static inline unsigned long ffz(unsigned long word)
-{
-    unsigned long result = 0;
-                                                                                
-    while(word & 1) {
-            result++;
-            word >>= 1;
-    }
-    return result;
-}
-
-/* FIXME: This is a really really crappy quick and dirty thing */
-static inline unsigned long find_next_zero_bit(void *addr, unsigned long size, unsigned long offset)
-{
-    unsigned long bits = sizeof(unsigned long) * 8;
-    unsigned long bits1 =  bits - 1;
-    unsigned long * p = ((unsigned long *) addr) + (offset >> 6);
-    unsigned long result = offset & ~bits1;
-    unsigned long tmp;
-
-    if (offset >= size)
-        return size;
-    size -= result;
-    offset &= bits1;
-    if (offset) {
-        tmp = *(p++);
-        tmp |= ~0UL >> (bits-offset);
-        if (size < bits)
-            goto found_first;
-        if (~tmp)
-            goto found_middle;
-        size -= bits;
-        result += bits;
-    }
-    while (size & ~bits1) {
-        if (~(tmp = *(p++)))
-            goto found_middle;
-        result += bits;
-        size -= bits;
-    }
-    if (!size)
-        return result;
-    tmp = *p;
-found_first:
-    tmp |= ~0UL << size;
-    if (tmp == ~0UL)        /* Are any bits zero? */
-        return result + size; /* Nope. */
-found_middle:
-    return result + ffz(tmp);
-}
-#endif
-
-
 /* include all the rest from ocfs.h */
 #include <ocfsbool.h>
 #include <ocfscom.h>