dlm: fix compile breakage

PATCH In review David Teigland 4 participants 6 messages May 18, 2007 – May 29, 2007 Distributed lock manager (DLM)

Share & tools

David Teigland

author maintainer

2007-05-18 21:02 UTC #0 lore raw

PATCH 1/1 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 <[email protected]>

fs/dlm/lock.c +2 -2

Index: linux-quilt/fs/dlm/lock.c
===================================================================
@@ -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);

David Teigland

author maintainer

2007-05-22 13:32 UTC #1 lore raw

PATCH 1/1 dlm: fix compile breakage

Fix compilation that broke when replacing log_error with log_debug. Slightly better version that the last.

Signed-off-by David Teigland <[email protected]>

fs/dlm/lock.c +2 -2

Index: linux-quilt/fs/dlm/lock.c
===================================================================
@@ -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);

Fabio Massimo Di Nitto

2007-05-23 05:09 UTC #2 lore raw

PATCH 1/1 dlm: fix compile breakage

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

Quoted 20 lines · David Teigland

Fix compilation that broke when replacing log_error with log_debug. Slightly better version that the last.
Signed-off-by David Teigland <[email protected]>
Index: linux-quilt/fs/dlm/lock.c
===================================================================
fs/dlm/lock.c +2 -2
@@ -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);

Signature · 1 line

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

Steven Whitehouse

2007-05-29 08:59 UTC #3 lore raw

In reply to David Teigland

Hi,

Now applied to the git tree. Thanks,

Steve.

Quoted 21 lines · David Teigland

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 <[email protected]>
Index: linux-quilt/fs/dlm/lock.c
===================================================================
fs/dlm/lock.c +2 -2
@@ -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);

Fabio Massimo Di Nitto

2007-05-29 09:59 UTC #4 lore raw

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

Quoted 28 lines · Steven Whitehouse

Hi,
Now applied to the git tree. Thanks,
Steve.
Quoted 21 lines · David Teigland
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 <[email protected]>
Index: linux-quilt/fs/dlm/lock.c
===================================================================
fs/dlm/lock.c +2 -2
@@ -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);

Signature · 1 line

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

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.

Quoted 41 lines · Fabio Massimo Di Nitto

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
Quoted 28 lines · Steven Whitehouse
Hi,
Now applied to the git tree. Thanks,
Steve.
Quoted 21 lines · David Teigland
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 <[email protected]>
Index: linux-quilt/fs/dlm/lock.c
===================================================================
fs/dlm/lock.c +2 -2
@@ -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);