From b8093ddbc1ac492f0ffb5cc34003a88927b3f747 Mon Sep 17 00:00:00 2001
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 29 May 2007 11:14:21 +0100
Subject: [PATCH] --- yaml --- r: 58556 b: refs/heads/master c:
 b3cab7b9a34a6e65c1ca8f80fb57b256d57e8555 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/dlm/lock.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index 8e0498a1bc9d..43a5285d115d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 518bbde33f7a6b4e252ea2591c77ef796065afa8
+refs/heads/master: b3cab7b9a34a6e65c1ca8f80fb57b256d57e8555
diff --git a/trunk/fs/dlm/lock.c b/trunk/fs/dlm/lock.c
index b47e6fd0172c..2f8a5a700cc0 100644
--- a/trunk/fs/dlm/lock.c
+++ b/trunk/fs/dlm/lock.c
@@ -1098,7 +1098,7 @@ void dlm_scan_timeout(struct dlm_ls *ls)
 		}
 
 		if (do_cancel) {
-			log_debug(r->res_ls, "timeout cancel %x node %d %s",
+			log_debug(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;