Commit 639aca41 authored May 18, 2007 by David Teigland Committed by Steven Whitehouse Jul 09, 2007

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

parent 8b0e7b2c

fs/dlm/lock.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -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);

Admin message