* [Cluster-devel] [PATCH] dlm: fix compile breakage
@ 2007-05-18 21:02 David Teigland
2007-05-22 13:32 ` David Teigland
2007-05-29 8:59 ` [Cluster-devel] " Steven Whitehouse
0 siblings, 2 replies; 7+ messages in thread
From: David Teigland @ 2007-05-18 21:02 UTC (permalink / raw)
To: cluster-devel.redhat.com
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);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] [PATCH] dlm: fix compile breakage
2007-05-18 21:02 [Cluster-devel] [PATCH] dlm: fix compile breakage David Teigland
@ 2007-05-22 13:32 ` David Teigland
2007-05-23 5:09 ` Fabio Massimo Di Nitto
2007-05-29 8:59 ` [Cluster-devel] " Steven Whitehouse
1 sibling, 1 reply; 7+ messages in thread
From: David Teigland @ 2007-05-22 13:32 UTC (permalink / raw)
To: cluster-devel.redhat.com
Fix compilation that broke when replacing log_error with log_debug.
Slightly better version that the last.
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-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);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] [PATCH] dlm: fix compile breakage
2007-05-22 13:32 ` David Teigland
@ 2007-05-23 5:09 ` Fabio Massimo Di Nitto
0 siblings, 0 replies; 7+ messages in thread
From: Fabio Massimo Di Nitto @ 2007-05-23 5:09 UTC (permalink / raw)
To: cluster-devel.redhat.com
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@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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] Re: [PATCH] dlm: fix compile breakage
2007-05-18 21:02 [Cluster-devel] [PATCH] dlm: fix compile breakage David Teigland
2007-05-22 13:32 ` David Teigland
@ 2007-05-29 8:59 ` Steven Whitehouse
2007-05-29 9:59 ` Fabio Massimo Di Nitto
1 sibling, 1 reply; 7+ messages in thread
From: Steven Whitehouse @ 2007-05-29 8:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
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);
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] Re: [PATCH] dlm: fix compile breakage
2007-05-29 8:59 ` [Cluster-devel] " Steven Whitehouse
@ 2007-05-29 9:59 ` Fabio Massimo Di Nitto
2007-05-29 10:27 ` Steven Whitehouse
0 siblings, 1 reply; 7+ messages in thread
From: Fabio Massimo Di Nitto @ 2007-05-29 9:59 UTC (permalink / raw)
To: cluster-devel.redhat.com
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.
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] Re: [PATCH] dlm: fix compile breakage
2007-05-29 9:59 ` Fabio Massimo Di Nitto
@ 2007-05-29 10:27 ` Steven Whitehouse
0 siblings, 0 replies; 7+ messages in thread
From: Steven Whitehouse @ 2007-05-29 10:27 UTC (permalink / raw)
To: cluster-devel.redhat.com
Hi,
Ah. I'd not spotted that there were two different update patches :( I've
made the change myself as its easier to do that than to remove and
reapply the later patch at this stage. It compiles ok for me anyway now,
Steve.
On Tue, 2007-05-29 at 11:59 +0200, Fabio Massimo Di Nitto wrote:
> 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);
>
>
^ permalink raw reply [flat|nested] 7+ messages in thread
* [Cluster-devel] [PATCH] [DLM] fix compile breakage
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] wait for config check during join [6/6] swhiteho
@ 2007-07-09 16:02 ` swhiteho
0 siblings, 0 replies; 7+ messages in thread
From: swhiteho @ 2007-07-09 16:02 UTC (permalink / raw)
To: cluster-devel.redhat.com
From: David Teigland <teigland@redhat.com>
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>
diff --git a/fs/dlm/lock.c b/fs/dlm/lock.c
index 3c4d570..b47e6fd 100644
--- a/fs/dlm/lock.c
+++ b/fs/dlm/lock.c
@@ -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);
--
1.5.1.2
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2007-07-09 16:02 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-18 21:02 [Cluster-devel] [PATCH] dlm: fix compile breakage David Teigland
2007-05-22 13:32 ` David Teigland
2007-05-23 5:09 ` Fabio Massimo Di Nitto
2007-05-29 8:59 ` [Cluster-devel] " Steven Whitehouse
2007-05-29 9:59 ` Fabio Massimo Di Nitto
2007-05-29 10:27 ` Steven Whitehouse
-- strict thread matches above, loose matches on Subject: below --
2007-07-09 16:02 [Cluster-devel] [GFS2/DLM] Pre-pull Patch Posting swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] flush the glock completely in inode_go_sync swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix a couple of races swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] kernel changes to support new gfs2_grow command swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Kernel changes to support new gfs2_grow command (part 2) swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] use zero_user_page swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Addendum patch 2 for gfs2_grow swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Reduce size of struct gdlm_lock swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Clean up inode number handling swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [GFS2] Quotas non-functional - fix bug swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] keep dlm from panicing when traversing rsb list in debugfs swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] block scand during recovery [1/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] add lock timeouts and warnings [2/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] dlm_device interface changes [3/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] cancel in conversion deadlock [4/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix new_lockspace error exit [5/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] wait for config check during join [6/6] swhiteho
2007-07-09 16:02 ` [Cluster-devel] [PATCH] [DLM] fix compile breakage swhiteho
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).