The patch titled
Dave broke gfs2-2.6-nmw.git
has been added to the -mm tree. Its filename is
dave-broke-gfs2-26-nmwgit.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: Dave broke gfs2-2.6-nmw.git
From: David Teigland <[EMAIL PROTECTED]>
Fix compilation that broke when replacing log_error with log_debug.
Signed-off-by: David Teigland <[EMAIL PROTECTED]>
Signed-off-by: Andrew Morton <[EMAIL PROTECTED]>
---
fs/dlm/lock.c | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff -puN fs/dlm/lock.c~dave-broke-gfs2-26-nmwgit fs/dlm/lock.c
--- a/fs/dlm/lock.c~dave-broke-gfs2-26-nmwgit
+++ a/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);
_
Patches currently in -mm which might be from [EMAIL PROTECTED] are
git-gfs2-nmw.patch
dave-broke-gfs2-26-nmwgit.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
