[Cluster-devel] [PATCH] dlm: fix compile breakage
Fabio Massimo Di Nitto
fabbione at fabbione.net
Wed May 23 05:09:18 UTC 2007
Steven if you prefer to pull I have the gfs2_ondisk and this patch in my gfs2
git tree here:
http://kernel.ubuntu.com/git?p=fabbione/ubuntu-gutsy-gfs2.git;a=summary
git://kernel.ubuntu.com/fabbione/ubuntu-gutsy-gfs2.git
commit edefc430863141e79b88ab506df01179e5271580
commit 0289286a1ae4c335ea738a3593518b18db57be04
Fabio
David Teigland wrote:
> Fix compilation that broke when replacing log_error with log_debug.
> Slightly better version that the last.
>
> Signed-off-by: David Teigland <teigland at 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-22 08:29:56.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(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.
More information about the Cluster-devel
mailing list