diff options
| author | David Teigland <teigland@redhat.com> | 2008-01-09 10:30:45 -0600 |
|---|---|---|
| committer | David Teigland <teigland@redhat.com> | 2008-01-30 11:04:42 -0600 |
| commit | 42dc1601a9a31e8da767a4a9c37bad844b3698ab (patch) | |
| tree | 9dad1fcde32f07438a3eec34d6b4d2497ba6082d /fs/dlm | |
| parent | c54e04b00fe027da30ada5af76b6749772dd644a (diff) | |
| download | kernel_samsung_tuna-42dc1601a9a31e8da767a4a9c37bad844b3698ab.zip kernel_samsung_tuna-42dc1601a9a31e8da767a4a9c37bad844b3698ab.tar.gz kernel_samsung_tuna-42dc1601a9a31e8da767a4a9c37bad844b3698ab.tar.bz2 | |
dlm: reject normal unlock when lock is waiting for lookup
Non-forced unlocks should be rejected if the lock is waiting on the
rsb_lookup list for another lock to establish the master node.
Signed-off-by: David Teigland <teigland@redhat.com>
Diffstat (limited to 'fs/dlm')
| -rw-r--r-- | fs/dlm/lock.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c index c2890ef..fa68e9b 100644 --- a/fs/dlm/lock.c +++ b/fs/dlm/lock.c @@ -2110,17 +2110,18 @@ static int validate_unlock_args(struct dlm_lkb *lkb, struct dlm_args *args) /* an lkb may be waiting for an rsb lookup to complete where the lookup was initiated by another lock */ - if (args->flags & (DLM_LKF_CANCEL | DLM_LKF_FORCEUNLOCK)) { - if (!list_empty(&lkb->lkb_rsb_lookup)) { + if (!list_empty(&lkb->lkb_rsb_lookup)) { + if (args->flags & (DLM_LKF_CANCEL | DLM_LKF_FORCEUNLOCK)) { log_debug(ls, "unlock on rsb_lookup %x", lkb->lkb_id); list_del_init(&lkb->lkb_rsb_lookup); queue_cast(lkb->lkb_resource, lkb, args->flags & DLM_LKF_CANCEL ? -DLM_ECANCEL : -DLM_EUNLOCK); unhold_lkb(lkb); /* undoes create_lkb() */ - rv = -EBUSY; - goto out; } + /* caller changes -EBUSY to 0 for CANCEL and FORCEUNLOCK */ + rv = -EBUSY; + goto out; } /* cancel not allowed with another cancel/unlock in progress */ |