[Ocfs2-commits] mfasheh commits r807 - trunk/src

[svn-commits at oss.oracle.com]

Author: mfasheh
Date: 2004-03-22 17:08:58 -0600 (Mon, 22 Mar 2004)
New Revision: 807

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

The following patch fixes a couple of minor warnings about lockflags
and lock_path not being used.



Modified: trunk/src/dlm.c
===================================================================
--- trunk/src/dlm.c	2004-03-22 22:59:31 UTC (rev 806)
+++ trunk/src/dlm.c	2004-03-22 23:08:58 UTC (rev 807)
@@ -1237,12 +1237,10 @@
 	ocfs_lock_res *lockres = NULL;
 	int k = 0;
 	struct buffer_head *tmpbh = NULL, **b = NULL;
-	int lockflags = (lock_id >= osb->vol_layout.bitmap_off ? OCFS_BH_CACHED : 0);
 	/* TODO: 40 bytes of "bool" sitting on the stack for now. move    */
 	/*       mutually exclusive flags into an enum and switch on them */
 	bool disk_vote = false;
 	bool no_owner = false, owner_dead = false, wait_on_recovery = false;
-	int lock_path = invalid_path;
 	__u32 extra_lock_flags = 0;
 
 	LOG_ENTRY_ARGS ("(0x%08x, %u.%u, %u, %u, 0x%08x, 0x%08x)\n", osb,