[Ocfs2-tools-commits] mfasheh commits r429 - branches/dlm-glue/dlmtools

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-11-19 18:49:40 -0600 (Fri, 19 Nov 2004)
New Revision: 429

Modified:
   branches/dlm-glue/dlmtools/mount.ocfs2.c
Log:
* don't use the kernel bitops header and instead use the libocfs2 one.



Modified: branches/dlm-glue/dlmtools/mount.ocfs2.c
===================================================================
--- branches/dlm-glue/dlmtools/mount.ocfs2.c	2004-11-19 23:46:07 UTC (rev 428)
+++ branches/dlm-glue/dlmtools/mount.ocfs2.c	2004-11-20 00:49:40 UTC (rev 429)
@@ -55,7 +55,6 @@
 #include <linux/fd.h>
 #include <string.h>
 #include <sys/stat.h>
-#include <asm/bitops.h>
 
 #define  OCFS2_FLAT_INCLUDES	1
 #include <ocfs2.h>
@@ -64,6 +63,7 @@
 #include <ocfs1_fs_compat.h>
 #include <kernel-list.h>
 
+#include "bitops.h"
 
 #include "dlmutil.h"
 #include "dlmcommon.h"
@@ -72,7 +72,6 @@
 #include "dlmtcp.h"
 
 
-
 #define CLUSTER_FILE   "/proc/cluster/nm/.cluster"
 #define GROUP_FILE     "/proc/cluster/nm/.group"
 #define NODE_FILE      "/proc/cluster/nm/.node"
@@ -455,7 +454,7 @@
 	/* go create this group and add this node on every other node I see */	
 	start = 0;
 	while (1) {
-		next = find_next_bit((unsigned long *)pre_nodemap, NM_MAX_NODES, start);
+		next = ocfs2_find_next_bit_set((unsigned long *)pre_nodemap, NM_MAX_NODES, start);
 		if (next >= NM_MAX_NODES) {
 			break;
 		}
@@ -488,7 +487,7 @@
 	}
 
 	/* keep going while there are still nodes to contact */
-	if (find_next_bit((unsigned long *)pre_nodemap, NM_MAX_NODES, 0) < NM_MAX_NODES)
+	if (ocfs2_find_next_bit_set((unsigned long *)pre_nodemap, NM_MAX_NODES, 0) < NM_MAX_NODES)
 		goto again;
 
 	return 0;