---

yaml --- r: 58556 b: refs/heads/master c: b3cab7b h: refs/heads/master v: v3
git-mirror · Jul 9, 2007 · b8093dd · b8093dd
1 parent ae6609d
commit b8093dd
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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;