[Ocfs2-commits] rev 748 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-02 16:20:55 -0600 (Tue, 02 Mar 2004)
New Revision: 748

Modified:
   trunk/src/nm.c
Log:
* include a patch by Rusty Lynch <rusty at linux.co.intel.com>

The following patch fixes some simple compile warnings.



Modified: trunk/src/nm.c
===================================================================
--- trunk/src/nm.c	2004-03-02 22:11:13 UTC (rev 747)
+++ trunk/src/nm.c	2004-03-02 22:20:55 UTC (rev 748)
@@ -39,6 +39,7 @@
 
 void ocfs_process_vote_worker(void *val);
 
+#ifdef VERBOSE_PROCESS_VOTE
 static const char *process_vote_strings[] = {
 	"INVALID_REQUEST",      // reply with a NO vote
 	"UPDATE_OIN_INODE",     // update both oin and inode
@@ -51,6 +52,7 @@
 	"REMASTER_THIS",        // remaster lock to me
 	"REMASTER_REQUESTOR"    // remaster lock to requestor
 };
+#endif
 
 /*
  * ocfs_recv_thread()
@@ -228,7 +230,8 @@
 	int status = 0;
 	__u8 *buffer = NULL;
 	ocfs_publish *publish;
-	__u32 i, j;
+	__u32 i;
+	unsigned long j;
 	__u32 highest_vote_node;
 	__u64 offset = 0;
 	__u32 num_nodes = 0;