[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

Re: [Cluster-devel] Re: [PATCH] dlm: fix compile breakage



Hi Steven,

you probably want to take the more recent version of this patch from cluster-devel.

r->res_ls should be ls.

Thanks for pulling the other patch too.

Fabio

Steven Whitehouse wrote:
Hi,

Now applied to the git tree. Thanks,

Steve.

On Fri, 2007-05-18 at 16:02 -0500, David Teigland wrote:
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>

Index: linux-quilt/fs/dlm/lock.c
===================================================================
--- linux-quilt.orig/fs/dlm/lock.c	2007-05-18 15:53:11.000000000 -0500
+++ linux-quilt/fs/dlm/lock.c	2007-05-18 15:54:51.000000000 -0500
@@ -1098,8 +1098,8 @@
 		}
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);


--
I'm going to make him an offer he can't refuse.


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]