[Ocfs2-tools-commits] jlbec commits r285 - in branches/dlm-changes: extras libocfs2 libocfs2/include

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-09-29 17:03:22 -0500 (Wed, 29 Sep 2004)
New Revision: 285

Modified:
   branches/dlm-changes/extras/
   branches/dlm-changes/libocfs2/Makefile
   branches/dlm-changes/libocfs2/bitmap.c
   branches/dlm-changes/libocfs2/include/bitmap.h
Log:

o Put bc_private on the bitmap_cluster
o Fix DEBUG_EXE builds to have the right deps.




Property changes on: branches/dlm-changes/extras
___________________________________________________________________
Name: svn:ignore
   - .*.sw?
find_hardlinks
find_dup_extents
find_inode_paths

   + .*.sw?
find_hardlinks
find_dup_extents
find_inode_paths
set_random_bits


Modified: branches/dlm-changes/libocfs2/Makefile
===================================================================
--- branches/dlm-changes/libocfs2/Makefile	2004-09-29 21:40:44 UTC (rev 284)
+++ branches/dlm-changes/libocfs2/Makefile	2004-09-29 22:03:22 UTC (rev 285)
@@ -35,13 +35,18 @@
 DEBUG_EXE_FILES = $(shell awk '/DEBUG_EXE/{if (k[FILENAME] == 0) {print FILENAME; k[FILENAME] = 1;}}' $(CFILES))
 DEBUG_EXE_PROGRAMS = $(addprefix debug_,$(subst .c,,$(DEBUG_EXE_FILES)))
 
+.SECONDARY:
+
 UNINST_PROGRAMS += $(DEBUG_EXE_PROGRAMS)
 
-debug_%: %.c libocfs2.a
+debug_%.o : %.c 
 	$(CC) $(CFLAGS) $(LOCAL_CFLAGS) $(CPPFLAGS) $(LOCAL_CPPFLAGS) \
-		$(INCLUDES) $(DEFINES) $(VERMAGIC) \
-		$(COM_ERR_LIBS) -DDEBUG_EXE -o $@ $^
+		$(INCLUDES) $(DEFINES) \
+		-DDEBUG_EXE -o $@ -c $<
 
+debug_%: debug_%.o libocfs2.a
+	$(LINK) $(COM_ERR_LIBS)
+
 endif
 
 CFILES = 		\

Modified: branches/dlm-changes/libocfs2/bitmap.c
===================================================================
--- branches/dlm-changes/libocfs2/bitmap.c	2004-09-29 21:40:44 UTC (rev 284)
+++ branches/dlm-changes/libocfs2/bitmap.c	2004-09-29 22:03:22 UTC (rev 285)
@@ -599,9 +599,9 @@
 		bc = rb_entry(node, struct ocfs2_bitmap_cluster, bc_node);
 
 		fprintf(stdout,
-			"(start: %"PRIu64", n: %d, set: %d, cpos: %"PRIu32")\n",
+			"(start: %"PRIu64", n: %d, set: %d)\n",
 			bc->bc_start_bit, bc->bc_total_bits,
-			bc->bc_set_bits, bc->bc_cpos);
+			bc->bc_set_bits);
 	}
 }
 

Modified: branches/dlm-changes/libocfs2/include/bitmap.h
===================================================================
--- branches/dlm-changes/libocfs2/include/bitmap.h	2004-09-29 21:40:44 UTC (rev 284)
+++ branches/dlm-changes/libocfs2/include/bitmap.h	2004-09-29 22:03:22 UTC (rev 285)
@@ -38,9 +38,9 @@
 					   handle bitmaps larger than
 					   int offsets */
 	int bc_set_bits;
-	uint32_t bc_cpos;		/* If this bitmap is stored
-					   on disk, where it lives */
 	char *bc_bitmap;
+
+	void *bc_private;
 };
 
 struct ocfs2_bitmap_operations {