X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;ds=sidebyside;f=libcfs%2Finclude%2Flibcfs%2Fuser-bitops.h;h=2e31e88e6bf7d00cd90b5cdc90e1417f99d70ad1;hb=3bffa4d32bc5b0bc71ba6873e262ddbca436bae1;hp=597931adde55cb0a1d98ef929719a132771b979d;hpb=70e80ade90af09300396706b8910e196a7928520;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/user-bitops.h b/libcfs/include/libcfs/user-bitops.h
index 597931a..2e31e88 100644
--- a/libcfs/include/libcfs/user-bitops.h
+++ b/libcfs/include/libcfs/user-bitops.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,8 +24,10 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
+ *
+ * Copyright (c) 2012, Intel Corporation.
  */
 /*
  * This file is part of Lustre, http://www.lustre.org/
@@ -42,9 +42,9 @@
 #define __LIBCFS_USER_BITOPS_H__
 
 /* test if bit nr is set in bitmap addr; returns previous value of bit nr */
-static __inline__ int set_bit(int nr, unsigned long * addr)
+static inline int test_and_set_bit(int nr, unsigned long *addr)
 {
-        long    mask;
+        unsigned long mask;
 
         addr += nr / BITS_PER_LONG;
         mask = 1UL << (nr & (BITS_PER_LONG - 1));
@@ -53,10 +53,12 @@ static __inline__ int set_bit(int nr, unsigned long * addr)
         return nr;
 }
 
+#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 clear_bit(int nr, unsigned long * addr)
+static inline int test_and_clear_bit(int nr, unsigned long *addr)
 {
-        long    mask;
+        unsigned long mask;
 
         addr += nr / BITS_PER_LONG;
         mask = 1UL << (nr & (BITS_PER_LONG - 1));
@@ -65,13 +67,55 @@ static __inline__ int clear_bit(int nr, unsigned long * addr)
         return nr;
 }
 
-static __inline__ int test_bit(int nr, const unsigned long * addr)
+#define clear_bit(n, a) test_and_clear_bit(n, a)
+
+static inline int test_bit(int nr, const unsigned long *addr)
 {
-        return ((1UL << (nr & (BITS_PER_LONG - 1))) & ((addr)[nr / BITS_PER_LONG])) != 0;
+        return ((1UL << (nr & (BITS_PER_LONG - 1))) &
+                ((addr)[nr / BITS_PER_LONG])) != 0;
 }
 
 /* using binary seach */
-static __inline__ unsigned long __ffs(long data)
+static __inline__ unsigned long __cfs_fls(long data)
+{
+	int pos = 32;
+
+	if (!data)
+		return 0;
+
+#if BITS_PER_LONG == 64
+        /* If any bit of the high 32 bits are set, shift the high
+         * 32 bits down and pretend like it is a 32-bit value. */
+        if ((data & 0xFFFFFFFF00000000llu)) {
+                data >>= 32;
+                pos += 32;
+        }
+#endif
+
+	if (!(data & 0xFFFF0000u)) {
+		data <<= 16;
+		pos -= 16;
+	}
+	if (!(data & 0xFF000000u)) {
+		data <<= 8;
+		pos -= 8;
+	}
+	if (!(data & 0xF0000000u)) {
+		data <<= 4;
+		pos -= 4;
+	}
+	if (!(data & 0xC0000000u)) {
+		data <<= 2;
+		pos -= 2;
+	}
+	if (!(data & 0x80000000u)) {
+		data <<= 1;
+		pos -= 1;
+	}
+	return pos;
+}
+
+static __inline__ unsigned long __cfs_ffs(long data)
 {
         int pos = 0;
 
@@ -103,15 +147,16 @@ static __inline__ unsigned long __ffs(long data)
         return pos;
 }
 
-#define __ffz(x)	__ffs(~(x))
+#define __cfs_ffz(x)	__cfs_ffs(~(x))
+#define __cfs_flz(x)	__cfs_fls(~(x))
 
 unsigned long find_next_bit(unsigned long *addr,
-                            unsigned long size, unsigned long offset);
+			    unsigned long size, unsigned long offset);
 
 unsigned long find_next_zero_bit(unsigned long *addr,
-                                 unsigned long size, unsigned long offset);
+				 unsigned long size, unsigned long offset);
 
-#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))
+#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