summaryrefslogtreecommitdiff
path: root/fs/dlm
diff options
context:
space:
mode:
authorDavid Teigland <teigland@redhat.com>2007-05-18 21:02:57 (GMT)
committerSteven Whitehouse <swhiteho@redhat.com>2007-07-09 07:22:45 (GMT)
commit639aca417d91ebba1077a6084e4423af1c1dd811 (patch)
treeb542aa0720998f1f64fe629bdc950668f33efdf4 /fs/dlm
parent8b0e7b2cf35aa827ed5efb508c1879481b970496 (diff)
downloadlinux-639aca417d91ebba1077a6084e4423af1c1dd811.tar.xz
[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: David Teigland <teigland@redhat.com> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/dlm')
-rw-r--r--fs/dlm/lock.c4
1 files changed, 2 insertions, 2 deletions
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);