ocfs2: fix check for locally granted state during dlmunlock()

[~andy/linux] / fs / ocfs2 / dlm / dlmunlock.c

diff --git a/fs/ocfs2/dlm/dlmunlock.c b/fs/ocfs2/dlm/dlmunlock.c
index 59866e471d9610f2618d1f02bca5a7beb8167ae3..37be4b2e0d4a8801982e97a8636f61abd1360d4e 100644 (file)
--- a/fs/ocfs2/dlm/dlmunlock.c
+++ b/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. */