[Ocfs2-commits] zab commits r2120 - trunk/fs/ocfs2/dlm

[svn-commits at oss.oracle.com]

Author: zab
Signed-off-by: khackel
Date: 2005-04-06 17:51:19 -0500 (Wed, 06 Apr 2005)
New Revision: 2120

Modified:
   trunk/fs/ocfs2/dlm/dlmmaster.c
Log:
o avoid a double-lock by dropping dlm->spinlock before calling
  dlm_flush_lockres_asts

Signed-off-by: khackel


Modified: trunk/fs/ocfs2/dlm/dlmmaster.c
===================================================================
--- trunk/fs/ocfs2/dlm/dlmmaster.c	2005-04-06 22:10:26 UTC (rev 2119)
+++ trunk/fs/ocfs2/dlm/dlmmaster.c	2005-04-06 22:51:19 UTC (rev 2120)
@@ -1449,8 +1449,10 @@
 	    !test_bit(target, dlm->domain_map)) {
 		/* target chosen is not alive */
 		ret = -EINVAL;
-		goto unlock;
 	}
+	spin_unlock(&dlm->spinlock);
+	if (ret)
+		goto not_live;
 
 	dlmprintk("continuing with target = %u\n", target);
 
@@ -1475,9 +1477,7 @@
 		spin_unlock(&res->spinlock);
 	}
 
-unlock:	
-	spin_unlock(&dlm->spinlock);
-
+not_live:
 	if (oldmle) {
 		/* master is known, detach if not already detached */
 		dlm_mle_detach_hb_events(dlm, oldmle);