projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
43279e5
)
dlm: ignore cancel on granted lock
author
David Teigland
<teigland@redhat.com>
Fri, 27 Feb 2009 21:23:28 +0000
(15:23 -0600)
committer
David Teigland
<teigland@redhat.com>
Wed, 11 Mar 2009 17:23:58 +0000
(12:23 -0500)
Return immediately from dlm_unlock(CANCEL) if the lock is
granted and not being converted; there's nothing to cancel.
Signed-off-by: David Teigland <teigland@redhat.com>
fs/dlm/lock.c
patch
|
blob
|
history
diff --git
a/fs/dlm/lock.c
b/fs/dlm/lock.c
index
8cb9204
..
205ec95
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: