sync user/kernel, mark extern functions as extern, make comments consistent.

diff --git a/include/xfs_bit.h b/include/xfs_bit.h
index 78d39a700ee2dee4e1a70877b92df3d2f24c55aa..3bf2e83a3f44c721a60124b4fa289e3cdefce4dd 100644 (file)
--- a/include/xfs_bit.h
+++ b/include/xfs_bit.h
@@ -64,39 +64,25 @@ __uint64_t xfs_mask64lo(int n);
 #define        XFS_MASK64LO(n)         (((__uint64_t)1 << (n)) - 1)
 #endif
 
-/*
- * Index of low bit number in byte, -1 for none set, 0..7 otherwise.
- */
-extern const char xfs_lowbit[256];
-
-/*
- * Index of high bit number in byte, -1 for none set, 0..7 otherwise.
- */
-extern const char xfs_highbit[256];
-
-/*
- * Count of bits set in byte, 0..8.
- */
-extern const char xfs_countbit[256];
-
-/*
- * xfs_lowbit32: get low bit set out of 32-bit argument, -1 if none set.
- */
+/* Get low bit set out of 32-bit argument, -1 if none set */
 extern int xfs_lowbit32(__uint32_t v);
 
-/*
- * xfs_highbit32: get high bit set out of 32-bit argument, -1 if none set.
- */
+/* Get high bit set out of 32-bit argument, -1 if none set */
 extern int xfs_highbit32(__uint32_t v);
 
-/*
- * xfs_lowbit64: get low bit set out of 64-bit argument, -1 if none set.
- */
+/* Get low bit set out of 64-bit argument, -1 if none set */
 extern int xfs_lowbit64(__uint64_t v);
 
-/*
- * xfs_highbit64: get high bit set out of 64-bit argument, -1 if none set.
- */
+/* Get high bit set out of 64-bit argument, -1 if none set */
 extern int xfs_highbit64(__uint64_t);
 
+/* Count set bits in map starting with start_bit */ 
+extern int xfs_count_bits(uint *map, uint size, uint start_bit);
+
+/* Count continuous one bits in map starting with start_bit */
+extern int xfs_contig_bits(uint *map, uint size, uint start_bit);
+
+/* Find next set bit in map */
+extern int xfs_next_bit(uint *map, uint size, uint start_bit);
+
 #endif /* __XFS_BIT_H__ */

diff --git a/libxfs/Makefile b/libxfs/Makefile
index 98986e307a181a0210de3d5906f5b31beb3924c3..36422ef0e9ba8259315ca6e3544487fe235ec14c 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -39,8 +39,8 @@ LT_REVISION = 0
 LT_AGE = 0
 
 HFILES = xfs.h
-CFILES = init.c logitem.c rdwr.c trans.c util.c \
-       xfs_bit.c xfs_rtbit.c xfs_alloc.c xfs_ialloc.c xfs_rtalloc.c \
+CFILES = bit.c init.c logitem.c rdwr.c trans.c util.c \
+       xfs_alloc.c xfs_ialloc.c xfs_rtalloc.c \
        xfs_inode.c xfs_btree.c xfs_alloc_btree.c xfs_ialloc_btree.c \
        xfs_bmap_btree.c xfs_da_btree.c xfs_dir.c xfs_dir_leaf.c \
        xfs_dir2.c xfs_dir2_leaf.c xfs_attr_leaf.c xfs_dir2_block.c \

diff --git a/libxfs/bit.c b/libxfs/bit.c
new file mode 100644 (file)
index 0000000..5a2a84f
--- /dev/null
+++ b/libxfs/bit.c
@@ -0,0 +1,331 @@
+/*
+ * Copyright (c) 2000-2002 Silicon Graphics, Inc.  All Rights Reserved.
+ * 
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms of version 2 of the GNU General Public License as
+ * published by the Free Software Foundation.
+ * 
+ * This program is distributed in the hope that it would be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ * 
+ * Further, this software is distributed without any warranty that it is
+ * free of the rightful claim of any third person regarding infringement
+ * or the like.  Any license provided herein, whether implied or
+ * otherwise, applies only to this software file.  Patent licenses, if
+ * any, provided herein do not apply to combinations of this program with
+ * other software, or any other product whatsoever.
+ * 
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write the Free Software Foundation, Inc., 59
+ * Temple Place - Suite 330, Boston MA 02111-1307, USA.
+ * 
+ * Contact information: Silicon Graphics, Inc., 1600 Amphitheatre Pkwy,
+ * Mountain View, CA  94043, or:
+ * 
+ * http://www.sgi.com 
+ * 
+ * For further information regarding this notice, see: 
+ * 
+ * http://oss.sgi.com/projects/GenInfo/SGIGPLNoticeExplan/
+ */
+
+/*
+ * XFS bit manipulation routines
+ */
+
+#include <xfs.h>
+
+/*
+ * Index of low bit number in byte, -1 for none set, 0..7 otherwise.
+ */
+static const char xfs_lowbit[256] = {
+       -1, 0, 1, 0, 2, 0, 1, 0,                        /* 00 .. 07 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 08 .. 0f */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* 10 .. 17 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 18 .. 1f */
+       5, 0, 1, 0, 2, 0, 1, 0,                 /* 20 .. 27 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 28 .. 2f */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* 30 .. 37 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 38 .. 3f */
+       6, 0, 1, 0, 2, 0, 1, 0,                 /* 40 .. 47 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 48 .. 4f */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* 50 .. 57 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 58 .. 5f */
+       5, 0, 1, 0, 2, 0, 1, 0,                 /* 60 .. 67 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 68 .. 6f */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* 70 .. 77 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 78 .. 7f */
+       7, 0, 1, 0, 2, 0, 1, 0,                 /* 80 .. 87 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 88 .. 8f */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* 90 .. 97 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* 98 .. 9f */
+       5, 0, 1, 0, 2, 0, 1, 0,                 /* a0 .. a7 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* a8 .. af */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* b0 .. b7 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* b8 .. bf */
+       6, 0, 1, 0, 2, 0, 1, 0,                 /* c0 .. c7 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* c8 .. cf */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* d0 .. d7 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* d8 .. df */
+       5, 0, 1, 0, 2, 0, 1, 0,                 /* e0 .. e7 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* e8 .. ef */
+       4, 0, 1, 0, 2, 0, 1, 0,                 /* f0 .. f7 */
+       3, 0, 1, 0, 2, 0, 1, 0,                 /* f8 .. ff */
+};
+
+/*
+ * Index of high bit number in byte, -1 for none set, 0..7 otherwise.
+ */
+static const char xfs_highbit[256] = {
+       -1, 0, 1, 1, 2, 2, 2, 2,                        /* 00 .. 07 */
+       3, 3, 3, 3, 3, 3, 3, 3,                 /* 08 .. 0f */
+       4, 4, 4, 4, 4, 4, 4, 4,                 /* 10 .. 17 */
+       4, 4, 4, 4, 4, 4, 4, 4,                 /* 18 .. 1f */
+       5, 5, 5, 5, 5, 5, 5, 5,                 /* 20 .. 27 */
+       5, 5, 5, 5, 5, 5, 5, 5,                 /* 28 .. 2f */
+       5, 5, 5, 5, 5, 5, 5, 5,                 /* 30 .. 37 */
+       5, 5, 5, 5, 5, 5, 5, 5,                 /* 38 .. 3f */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 40 .. 47 */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 48 .. 4f */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 50 .. 57 */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 58 .. 5f */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 60 .. 67 */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 68 .. 6f */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 70 .. 77 */
+       6, 6, 6, 6, 6, 6, 6, 6,                 /* 78 .. 7f */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* 80 .. 87 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* 88 .. 8f */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* 90 .. 97 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* 98 .. 9f */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* a0 .. a7 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* a8 .. af */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* b0 .. b7 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* b8 .. bf */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* c0 .. c7 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* c8 .. cf */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* d0 .. d7 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* d8 .. df */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* e0 .. e7 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* e8 .. ef */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* f0 .. f7 */
+       7, 7, 7, 7, 7, 7, 7, 7,                 /* f8 .. ff */
+};
+
+/*
+ * Count of bits set in byte, 0..8.
+ */
+static const char xfs_countbit[256] = {
+       0, 1, 1, 2, 1, 2, 2, 3,                 /* 00 .. 07 */
+       1, 2, 2, 3, 2, 3, 3, 4,                 /* 08 .. 0f */
+       1, 2, 2, 3, 2, 3, 3, 4,                 /* 10 .. 17 */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 18 .. 1f */
+       1, 2, 2, 3, 2, 3, 3, 4,                 /* 20 .. 27 */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 28 .. 2f */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 30 .. 37 */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* 38 .. 3f */
+       1, 2, 2, 3, 2, 3, 3, 4,                 /* 40 .. 47 */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 48 .. 4f */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 50 .. 57 */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* 58 .. 5f */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 60 .. 67 */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* 68 .. 6f */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* 70 .. 77 */
+       4, 5, 5, 6, 5, 6, 6, 7,                 /* 78 .. 7f */
+       1, 2, 2, 3, 2, 3, 3, 4,                 /* 80 .. 87 */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 88 .. 8f */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* 90 .. 97 */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* 98 .. 9f */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* a0 .. a7 */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* a8 .. af */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* b0 .. b7 */
+       4, 5, 5, 6, 5, 6, 6, 7,                 /* b8 .. bf */
+       2, 3, 3, 4, 3, 4, 4, 5,                 /* c0 .. c7 */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* c8 .. cf */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* d0 .. d7 */
+       4, 5, 5, 6, 5, 6, 6, 7,                 /* d8 .. df */
+       3, 4, 4, 5, 4, 5, 5, 6,                 /* e0 .. e7 */
+       4, 5, 5, 6, 5, 6, 6, 7,                 /* e8 .. ef */
+       4, 5, 5, 6, 5, 6, 6, 7,                 /* f0 .. f7 */
+       5, 6, 6, 7, 6, 7, 7, 8,                 /* f8 .. ff */
+};
+
+/*
+ * xfs_lowbit32: get low bit set out of 32-bit argument, -1 if none set.
+ */
+int
+xfs_lowbit32(
+       __uint32_t      v)
+{
+       int             i;
+
+       if (v & 0x0000ffff)
+               if (v & 0x000000ff)
+                       i = 0;
+               else
+                       i = 8;
+       else if (v & 0xffff0000)
+               if (v & 0x00ff0000)
+                       i = 16;
+               else
+                       i = 24;
+       else
+               return -1;
+       return i + xfs_lowbit[(v >> i) & 0xff];
+}
+
+/*
+ * xfs_highbit32: get high bit set out of 32-bit argument, -1 if none set.
+ */
+int
+xfs_highbit32(
+       __uint32_t      v)
+{
+       int             i;
+
+       if (v & 0xffff0000)
+               if (v & 0xff000000)
+                       i = 24;
+               else
+                       i = 16;
+       else if (v & 0x0000ffff)
+               if (v & 0x0000ff00)
+                       i = 8;
+               else
+                       i = 0;
+       else
+               return -1;
+       return i + xfs_highbit[(v >> i) & 0xff];
+}
+
+/*
+ * xfs_lowbit64: get low bit set out of 64-bit argument, -1 if none set.
+ */
+int
+xfs_lowbit64(
+       __uint64_t      v)
+{
+       int             i;
+#if XFS_64
+       if (v & 0x00000000ffffffff)
+               if (v & 0x000000000000ffff)
+                       if (v & 0x00000000000000ff)
+                               i = 0;
+                       else
+                               i = 8;
+               else
+                       if (v & 0x0000000000ff0000)
+                               i = 16;
+                       else
+                               i = 24;
+       else if (v & 0xffffffff00000000)
+               if (v & 0x0000ffff00000000)
+                       if (v & 0x000000ff00000000)
+                               i = 32;
+                       else
+                               i = 40;
+               else
+                       if (v & 0x00ff000000000000)
+                               i = 48;
+                       else
+                               i = 56;
+       else
+               return -1;
+       return i + xfs_lowbit[(v >> i) & 0xff];
+#else
+       __uint32_t      vw;
+
+       if ((vw = v)) {
+               if (vw & 0x0000ffff)
+                       if (vw & 0x000000ff)
+                               i = 0;
+                       else
+                               i = 8;
+               else
+                       if (vw & 0x00ff0000)
+                               i = 16;
+                       else
+                               i = 24;
+               return i + xfs_lowbit[(vw >> i) & 0xff];
+       } else if ((vw = v >> 32)) {
+               if (vw & 0x0000ffff)
+                       if (vw & 0x000000ff)
+                               i = 32;
+                       else
+                               i = 40;
+               else
+                       if (vw & 0x00ff0000)
+                               i = 48;
+                       else
+                               i = 56;
+               return i + xfs_lowbit[(vw >> (i - 32)) & 0xff];
+       } else
+               return -1;
+#endif
+}
+
+/*
+ * xfs_highbit64: get high bit set out of 64-bit argument, -1 if none set.
+ */
+int
+xfs_highbit64(
+       __uint64_t      v)
+{
+       int             i;
+#if  XFS_64
+       if (v & 0xffffffff00000000)
+               if (v & 0xffff000000000000)
+                       if (v & 0xff00000000000000)
+                               i = 56;
+                       else
+                               i = 48;
+               else
+                       if (v & 0x0000ff0000000000)
+                               i = 40;
+                       else
+                               i = 32;
+       else if (v & 0x00000000ffffffff)
+               if (v & 0x00000000ffff0000)
+                       if (v & 0x00000000ff000000)
+                               i = 24;
+                       else
+                               i = 16;
+               else
+                       if (v & 0x000000000000ff00)
+                               i = 8;
+                       else
+                               i = 0;
+       else
+               return -1;
+       return i + xfs_highbit[(v >> i) & 0xff];
+#else
+       __uint32_t      vw;
+
+       if ((vw = v >> 32)) {
+               if (vw & 0xffff0000)
+                       if (vw & 0xff000000)
+                               i = 56;
+                       else
+                               i = 48;
+               else
+                       if (vw & 0x0000ff00)
+                               i = 40;
+                       else
+                               i = 32;
+               return i + xfs_highbit[(vw >> (i - 32)) & 0xff];
+       } else if ((vw = v)) {
+               if (vw & 0xffff0000)
+                       if (vw & 0xff000000)
+                               i = 24;
+                       else
+                               i = 16;
+               else
+                       if (vw & 0x0000ff00)
+                               i = 8;
+                       else
+                               i = 0;
+               return i + xfs_highbit[(vw >> i) & 0xff];
+       } else
+               return -1;
+#endif
+}