Explorar o código

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>
Kurt Hackel %!s(int64=19) %!d(string=hai) anos
pai
achega
34e3d18037
Modificáronse 1 ficheiros con 1 adicións e 1 borrados
  1. 1 1
      fs/ocfs2/dlm/dlmunlock.c

+ 1 - 1
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. */