From: David Teigland <teigland@redhat.com>
Date: Fri, 18 May 2007 21:02:57 +0000 (-0500)
Subject: [DLM] fix compile breakage
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=639aca417d91ebba1077a6084e4423af1c1dd811;p=openwrt%2Fstaging%2Fblogic.git

[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>
---

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 3c4d570477b4..b47e6fd0172c 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);