[Ocfs2-commits] khackel commits r2927 - branches/ocfs2-1.2/fs/ocfs2/dlm

[svn-commits@oss.oracle.com]

Author: khackel
Signed-off-by: mfasheh
Date: 2006-07-12 16:44:28 -0500 (Wed, 12 Jul 2006)
New Revision: 2927

Modified:
   branches/ocfs2-1.2/fs/ocfs2/dlm/dlmunlock.c
Log:
* fix DLM_DENIED on non-master node when CANCELGRANT status received

Signed-off-by: mfasheh



Modified: branches/ocfs2-1.2/fs/ocfs2/dlm/dlmunlock.c
===================================================================
--- branches/ocfs2-1.2/fs/ocfs2/dlm/dlmunlock.c	2006-07-12 20:12:44 UTC (rev 2926)
+++ branches/ocfs2-1.2/fs/ocfs2/dlm/dlmunlock.c	2006-07-12 21:44:28 UTC (rev 2927)
@@ -155,7 +155,7 @@
 	else
 		status = dlm_get_unlock_actions(dlm, res, lock, lksb, &actions);
 
-	if (status != DLM_NORMAL && status != DLM_CANCELGRANT)
+	if (status != DLM_NORMAL && (status != DLM_CANCELGRANT || !master_node))
 		goto leave;
 
 	/* By now this has been masked out of cancel requests. */