Skip to contentSkip to conversation

trivial warning fixes

PATCH New Rusty Lynch 2 participants 3 messages Mar 1, 2004 – Mar 2, 2004 OCFS2

lore
Share & tools
lore

Rusty Lynch

author
#0 lore raw

PATCH 1/1 trivial warning fixes

The following patch fixes some simple compile warnings.

    --rusty
nm.c +4 -1
Index: src/nm.c
===================================================================
@@ -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;
file.c +2 -0
Index: src/file.c
===================================================================
@@ -347,7 +347,9 @@
         ocfs_super * osb;
         ocfs_inode *oin = NULL;
         struct dentry *dentry;
+#ifdef DO_PARENT_INODE_INC
         struct inode *parent;
+#endif
 	bool last_close = false;
 
 	LOG_ENTRY_ARGS ("(0x%08x, 0x%08x, '%*s')\n", inode, file,
author
#1 lore raw

PATCH 1/1 trivial warning fixes

Quoted 3 lines · Rusty Lynch

The following patch fixes some simple compile warnings.

    --rusty

Recent tree changes removed one of the compile warnings (the one for an unused variable named parent.) Here is the patch recreated against this mornings svn tree.

nm.c +4 -1
Index: src/nm.c
===================================================================
@@ -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;
#2 lore raw

PATCH 1/1 trivial warning fixes

Quoted 8 lines · Rusty Lynch
Quoted 3 lines · Rusty Lynch

The following patch fixes some simple compile warnings.

    --rusty

Recent tree changes removed one of the compile warnings (the one for an unused variable named parent.) Here is the patch recreated against this mornings svn tree.

Yep, I put the rest of the patch in today :)

	--Mark

--
Mark Fasheh
Software Developer, Oracle Corp
[email protected]