From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 29 May 2007 10:14:21 +0000 (+0100)
Subject: [DLM] Compile fix
X-Git-Tag: v2.6.23-rc1~1156^2~38
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b3cab7b9a34a6e65c1ca8f80fb57b256d57e8555;p=linux-2.6

[DLM] Compile fix

A one liner fix which got missed from the earlier patches.

Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Cc: Fabio Massimo Di Nitto <fabbione@ubuntu.com>
Cc: David Teigland <teigland@redhat.com>
---

diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index b47e6fd017..2f8a5a700c 100644
--- a/fs/dlm/lock.c
+++ b/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;