ocfs2: fix check for locally granted state during dlmunlock()
If a process requests a lock cancel but the lock has been remotely granted already then there is no need to send the cancel message. Signed-off-by: Kurt Hackel <kurt.hackel@oracle.com> Signed-off-by: Mark Fasheh <mark.fasheh@oracle.com>
This commit is contained in:
parent
a23eac99d4
commit
34e3d18037
|
@ -155,7 +155,7 @@ static enum dlm_status dlmunlock_common(struct dlm_ctxt *dlm,
|
||||||
else
|
else
|
||||||
status = dlm_get_unlock_actions(dlm, res, lock, lksb, &actions);
|
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;
|
goto leave;
|
||||||
|
|
||||||
/* By now this has been masked out of cancel requests. */
|
/* By now this has been masked out of cancel requests. */
|
||||||
|
|
Loading…
Reference in a new issue