Gitweb:
http://git.kernel.org/git/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commit;h=639aca417d91ebba1077a6084e4423af1c1dd811
Commit: 639aca417d91ebba1077a6084e4423af1c1dd811
Parent: 8b0e7b2cf35aa827ed5efb508c1879481b970496
Author: David Teigland <[EMAIL PROTECTED]>
AuthorDate: Fri May 18 16:02:57 2007 -0500
Committer: Steven Whitehouse <[EMAIL PROTECTED]>
CommitDate: Mon Jul 9 08:22:45 2007 +0100
[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]>
Signed-off-by: Steven Whitehouse <[EMAIL PROTECTED]>
---
fs/dlm/lock.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
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);
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
