projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'origin' into devel
[linux-2.6-block.git]
/
fs
/
dlm
/
lock.c
diff --git
a/fs/dlm/lock.c
b/fs/dlm/lock.c
index 8cb92046a5844c1a9f1148f5c1770c8aa7744ce2..205ec95b347e3001b6cb4358b8c6539802d95bed 100644
(file)
--- a/
fs/dlm/lock.c
+++ b/
fs/dlm/lock.c
@@
-2186,6
+2186,13
@@
static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
goto out;
}
+ /* there's nothing to cancel */
+ if (lkb->lkb_status == DLM_LKSTS_GRANTED &&
+ !lkb->lkb_wait_type) {
+ rv = -EBUSY;
+ goto out;
+ }
+
switch (lkb->lkb_wait_type) {
case DLM_MSG_LOOKUP:
case DLM_MSG_REQUEST: