---

yaml --- r: 33361 b: refs/heads/master c: 34e3d18 h: refs/heads/master i: 33359: 1c1fc2a v: v3
git-mirror · Aug 7, 2006 · e38d0c3 · e38d0c3
1 parent ef5af97
commit e38d0c3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a23eac99d4392b8b779305498d7614e41a0e16e9
+refs/heads/master: 34e3d180370c44ad3ecd3a1f9099e150d3bb103f
diff --git a/trunk/fs/ocfs2/dlm/dlmunlock.c b/trunk/fs/ocfs2/dlm/dlmunlock.c
@@ -155,7 +155,7 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm,
 	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. */