Commit 639aca41 authored by David Teigland's avatar David Teigland Committed by Steven Whitehouse
Browse files

[DLM] fix compile breakage

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: default avatarDavid Teigland <>
Signed-off-by: default avatarSteven Whitehouse <>
parent 8b0e7b2c
...@@ -1098,8 +1098,8 @@ void dlm_scan_timeout(struct dlm_ls *ls) ...@@ -1098,8 +1098,8 @@ void dlm_scan_timeout(struct dlm_ls *ls)
} }
if (do_cancel) { if (do_cancel) {
log_debug("timeout cancel %x node %d %s", lkb->lkb_id, log_debug(r->res_ls, "timeout cancel %x node %d %s",
lkb->lkb_nodeid, r->res_name); lkb->lkb_id, lkb->lkb_nodeid, r->res_name);
lkb->lkb_flags &= ~DLM_IFL_WATCH_TIMEWARN; lkb->lkb_flags &= ~DLM_IFL_WATCH_TIMEWARN;
lkb->lkb_flags |= DLM_IFL_TIMEOUT_CANCEL; lkb->lkb_flags |= DLM_IFL_TIMEOUT_CANCEL;
del_timeout(lkb); del_timeout(lkb);
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment