[Ocfs-tools-commits] manish commits r33 - in trunk: debugocfs fsck

[svn-commits at oss.oracle.com]

Author: manish
Date: 2004-05-19 15:12:24 -0500 (Wed, 19 May 2004)
New Revision: 33

Modified:
   trunk/debugocfs/extfinder.c
   trunk/debugocfs/print.c
   trunk/fsck/fsck.c
Log:
Kill warnings with test_bit funcs


Modified: trunk/debugocfs/extfinder.c
===================================================================
--- trunk/debugocfs/extfinder.c	2004-05-19 20:12:06 UTC (rev 32)
+++ trunk/debugocfs/extfinder.c	2004-05-19 20:12:24 UTC (rev 33)
@@ -116,7 +116,7 @@
 	run.start = -1;
 	run.size = 0;
 	for (i = 0; i < non_sysfile; i++) {
-		if (!test_bit(i, bmbuf)) {
+		if (!test_bit(i, (unsigned long *)bmbuf)) {
 			run.size++;
 			if (run.start==-1)
 				run.start = i;

Modified: trunk/debugocfs/print.c
===================================================================
--- trunk/debugocfs/print.c	2004-05-19 20:12:06 UTC (rev 32)
+++ trunk/debugocfs/print.c	2004-05-19 20:12:24 UTC (rev 33)
@@ -110,7 +110,7 @@
     for (i=0; i<bmsize; i++)
     {
         off = func(i, data);
-        if (test_bit(i, bmbuf))
+        if (test_bit(i, (unsigned long *)bmbuf))
         {
             printf("\t\t%llu (%d)\n", off, i);
         }
@@ -119,7 +119,7 @@
     for (i=0; i<bmsize; i++)
     {
         off = func(i, data);
-        if (!test_bit(i, bmbuf))
+        if (!test_bit(i, (unsigned long *)bmbuf))
         {
             printf("\t\t%llu (%d)\n", off, i);
         }

Modified: trunk/fsck/fsck.c
===================================================================
--- trunk/fsck/fsck.c	2004-05-19 20:12:06 UTC (rev 32)
+++ trunk/fsck/fsck.c	2004-05-19 20:12:24 UTC (rev 33)
@@ -837,9 +837,9 @@
 	/* clearing all the allocated bits in the global bitmap */
 	for (i = 0; i < ctxt.vol_bm_data->len; ++i) {
 		bm1 = &(g_array_index(ctxt.vol_bm_data, bitmap_data, i));
-		j = __test_and_clear_bit(bm1->bitnum, vol_bm);
+		j = __test_and_clear_bit(bm1->bitnum, (unsigned long *)vol_bm);
 		if (!j) {
-			if (!test_bit(bm1->bitnum, ctxt.vol_bm))
+			if (!test_bit(bm1->bitnum, (unsigned long *)ctxt.vol_bm))
 				g_array_append_val(bits, bm1->bitnum);
 		}
 	}
@@ -929,9 +929,9 @@
 				  str, bm1->alloc_node, HILO(bm1->fss_off));
 			continue;
 		}
-		j = __test_and_clear_bit(bm1->bitnum, temp_bm[bm1->alloc_node]);
+		j = __test_and_clear_bit(bm1->bitnum, (unsigned long *)temp_bm[bm1->alloc_node]);
 		if (!j) {
-			if (!test_bit(bm1->bitnum, node_bm[bm1->alloc_node]))
+			if (!test_bit(bm1->bitnum, (unsigned long *)node_bm[bm1->alloc_node]))
 				LOG_ERROR("Bit %u is unset in the %s bitmap "
 					  "of node %d", bm1->bitnum, str,
 					  bm1->alloc_node);