Skip to content

Commit

Permalink
ocfs2: fix check for locally granted state during dlmunlock()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kurt Hackel authored and Mark Fasheh committed Aug 7, 2006
1 parent a23eac9 commit 34e3d18
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion fs/ocfs2/dlm/dlmunlock.c
Original file line number Diff line number Diff line change
Expand Up @@ -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. */
Expand Down

0 comments on commit 34e3d18

Please sign in to comment.