lkml.org 
[lkml]   [2008]   [Jan]   [24]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 14/19] dlm: reject normal unlock when lock is waiting for lookup
    Date
    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>
    ---
    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 */
    --
    1.5.3.3


    \
     
     \ /
      Last update: 2008-01-24 18:15    [W:3.831 / U:0.008 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site