lkml.org 
[lkml]   [2007]   [Jul]   [9]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH] [DLM] fix compile breakage
    Date
    From: David Teigland <teigland@redhat.com>

    In the rush to get the previous patch set sent, a compilation bug I fixed
    shortly before sending somehow got clobbered, probably by a missed quilt
    refresh or something.

    Signed-off-by: David Teigland <teigland@redhat.com>
    Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>

    diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
    index 3c4d570..b47e6fd 100644
    --- a/fs/dlm/lock.c
    +++ b/fs/dlm/lock.c
    @@ -1098,8 +1098,8 @@ void dlm_scan_timeout(struct dlm_ls *ls)
    }

    if (do_cancel) {
    - log_debug("timeout cancel %x node %d %s", lkb->lkb_id,
    - lkb->lkb_nodeid, r->res_name);
    + log_debug(r->res_ls, "timeout cancel %x node %d %s",
    + lkb->lkb_id, lkb->lkb_nodeid, r->res_name);
    lkb->lkb_flags &= ~DLM_IFL_WATCH_TIMEWARN;
    lkb->lkb_flags |= DLM_IFL_TIMEOUT_CANCEL;
    del_timeout(lkb);
    --
    1.5.1.2
    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-07-09 18:31    [W:4.328 / U:1.024 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site