summaryrefslogtreecommitdiffstats
path: root/fs/ocfs2
diff options
context:
space:
mode:
authorKurt Hackel <kurt.hackel@oracle.com>2006-07-15 10:22:39 -0700
committerMark Fasheh <mark.fasheh@oracle.com>2006-08-07 10:55:22 -0700
commit34e3d180370c44ad3ecd3a1f9099e150d3bb103f (patch)
treef0e942f11654d3923ddf2c854be5e94572eb52e9 /fs/ocfs2
parenta23eac99d4392b8b779305498d7614e41a0e16e9 (diff)
downloadlinux-stable-34e3d180370c44ad3ecd3a1f9099e150d3bb103f.tar.gz
linux-stable-34e3d180370c44ad3ecd3a1f9099e150d3bb103f.tar.bz2
linux-stable-34e3d180370c44ad3ecd3a1f9099e150d3bb103f.zip
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>
Diffstat (limited to 'fs/ocfs2')
-rw-r--r--fs/ocfs2/dlm/dlmunlock.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/ocfs2/dlm/dlmunlock.c b/fs/ocfs2/dlm/dlmunlock.c
index 59866e471d96..37be4b2e0d4a 100644
--- 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. */