[Ocfs2-tools-commits] jlbec commits r300 - in branches/dlm-changes: debugfs.ocfs2 mkfs.ocfs2

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-09-30 14:25:03 -0500 (Thu, 30 Sep 2004)
New Revision: 300

Modified:
   branches/dlm-changes/debugfs.ocfs2/Makefile
   branches/dlm-changes/mkfs.ocfs2/Makefile
   branches/dlm-changes/mkfs.ocfs2/mkfs.c
Log:

o Make mkfs use bitops.h.  From trunk.



Modified: branches/dlm-changes/debugfs.ocfs2/Makefile
===================================================================
--- branches/dlm-changes/debugfs.ocfs2/Makefile	2004-09-30 19:20:25 UTC (rev 299)
+++ branches/dlm-changes/debugfs.ocfs2/Makefile	2004-09-30 19:25:03 UTC (rev 300)
@@ -24,6 +24,8 @@
 
 OBJS = $(subst .c,.o,$(CFILES))
 
+LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
+
 MANS = debugfs.ocfs2.8
 
 DIST_FILES = $(CFILES) $(HFILES) README debugfs.ocfs2.8.in
@@ -34,6 +36,6 @@
 	$(TOPDIR)/mkinstalldirs $(DIST_DIR)/include
 
 debugfs.ocfs2: $(OBJS)
-	$(LINK) $(GLIB_LIBS) -lreadline -lncurses
+	$(LINK) $(GLIB_LIBS) $(LIBOCFS2_LIBS) $(COM_ERR_LIBS) -lreadline -lncurses
 
 include $(TOPDIR)/Postamble.make

Modified: branches/dlm-changes/mkfs.ocfs2/Makefile
===================================================================
--- branches/dlm-changes/mkfs.ocfs2/Makefile	2004-09-30 19:20:25 UTC (rev 299)
+++ branches/dlm-changes/mkfs.ocfs2/Makefile	2004-09-30 19:25:03 UTC (rev 300)
@@ -17,8 +17,7 @@
 LIBOCFS2_LIBS = -L$(TOPDIR)/libocfs2 -locfs2
 
 INCLUDES = $(LIBOCFS2_CFLAGS)
-DEFINES = -DLINUX -DUSERSPACE_TOOL -DFORMAT_OCFS -DOCFS2_FLAT_INCLUDES \
-	-DVERSION=\"$(VERSION)\"
+DEFINES = -DOCFS2_FLAT_INCLUDES -DVERSION=\"$(VERSION)\"
 
 OPTIMIZE = -O2
 

Modified: branches/dlm-changes/mkfs.ocfs2/mkfs.c
===================================================================
--- branches/dlm-changes/mkfs.ocfs2/mkfs.c	2004-09-30 19:20:25 UTC (rev 299)
+++ branches/dlm-changes/mkfs.ocfs2/mkfs.c	2004-09-30 19:25:03 UTC (rev 300)
@@ -41,9 +41,8 @@
 #include <netinet/in.h>
 #include <inttypes.h>
 
-#include <asm/bitops.h>
-
 #include "ocfs2.h"
+#include "bitops.h"
 
 /* jfs_compat.h defines these */
 #undef cpu_to_be32
@@ -916,7 +915,7 @@
 	off = offset;
 
 	while ((size - off + count >= num_bits) &&
-	       (next_zero = find_next_zero_bit(buf, size, off)) != size) {
+	       (next_zero = ocfs2_find_next_bit_clear(buf, size, off)) != size) {
 		if (next_zero >= bitmap->valid_bits)
 			break;
 
@@ -986,7 +985,7 @@
 	bitmap->bm_record->bi.used_bits += num_bits;
 
 	while (num_bits--) {
-		set_bit(start_bit, bitmap->buf);
+		ocfs2_set_bit(start_bit, bitmap->buf);
 		start_bit++;
 	}