Commit 34e3d180 authored by Kurt Hackel's avatar Kurt Hackel Committed by Mark Fasheh
Browse files

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: default avatarKurt Hackel <kurt.hackel@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent a23eac99

fs/ocfs2/dlm/dlmunlock.c

+1 −1
Original line number Diff line number Diff line
@@ -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. */