From mboxrd@z Thu Jan  1 00:00:00 1970
From: Steven Whitehouse <swhiteho@redhat.com>
Date: Tue, 29 May 2007 09:59:19 +0100
Subject: [Cluster-devel] Re: [PATCH] dlm: fix compile breakage
In-Reply-To: <20070518210257.GA1266@redhat.com>
References: <20070518210257.GA1266@redhat.com>
Message-ID: <1180429159.25918.43.camel@quoit>
List-Id: <cluster-devel.redhat.com>
To: cluster-devel.redhat.com
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

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);