From e38d0c36fefd82910da59ad122df3e137ac13721 Mon Sep 17 00:00:00 2001 From: Kurt Hackel Date: Sat, 15 Jul 2006 10:22:39 -0700 Subject: [PATCH] --- yaml --- r: 33361 b: refs/heads/master c: 34e3d180370c44ad3ecd3a1f9099e150d3bb103f h: refs/heads/master i: 33359: 1c1fc2a8d1d8c44657965ed6701b8d1955ef78d2 v: v3 --- [refs] | 2 +- trunk/fs/ocfs2/dlm/dlmunlock.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 27b3e0787afe..74246055641b 100644 --- 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 index 59866e471d96..37be4b2e0d4a 100644 --- 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. */