lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

dlm: ignore cancel on granted lock

Browse Source 
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>
This commit is contained in:
David Teigland
2009-02-27 15:23:28 -06:00
parent 43279e5376
commit a536e38125
1 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
fs/dlm/lock.c
View File

@@ -2186,6 +2186,13 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args)
goto out; 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) { switch (lkb->lkb_wait_type) {
case DLM_MSG_LOOKUP: case DLM_MSG_LOOKUP:
case DLM_MSG_REQUEST: case DLM_MSG_REQUEST: