From: David Teigland <teigland@redhat.com>
To: akpm@osdl.org
Cc: linux-kernel@vger.kernel.org
Subject: [PATCH 5/7] dlm: printk with ll
Date: Thu, 19 Jan 2006 15:30:57 -0600 [thread overview]
Message-ID: <20060119213057.GE31387@redhat.com> (raw)
Use ll printk format for 64 bit values.
Signed-off-by: David Teigland <teigland@redhat.com>
Index: linux/drivers/dlm/debug_fs.c
===================================================================
--- linux.orig/drivers/dlm/debug_fs.c
+++ linux/drivers/dlm/debug_fs.c
@@ -63,12 +63,12 @@ static void print_lock(struct seq_file *
/* FIXME: this warns on Alpha */
if (lkb->lkb_status == DLM_LKSTS_CONVERT
|| lkb->lkb_status == DLM_LKSTS_GRANTED)
- seq_printf(s, " %" PRIx64 "-%" PRIx64,
+ seq_printf(s, " %llx-%llx",
lkb->lkb_range[GR_RANGE_START],
lkb->lkb_range[GR_RANGE_END]);
if (lkb->lkb_status == DLM_LKSTS_CONVERT
|| lkb->lkb_status == DLM_LKSTS_WAITING)
- seq_printf(s, " (%" PRIx64 "-%" PRIx64 ")",
+ seq_printf(s, " (%llx-%llx)",
lkb->lkb_range[RQ_RANGE_START],
lkb->lkb_range[RQ_RANGE_END]);
}
Index: linux/drivers/dlm/dlm_internal.h
===================================================================
--- linux.orig/drivers/dlm/dlm_internal.h
+++ linux/drivers/dlm/dlm_internal.h
@@ -42,12 +42,6 @@
#define DLM_LOCKSPACE_LEN 64
-#if (BITS_PER_LONG == 64)
-#define PRIx64 "lx"
-#else
-#define PRIx64 "Lx"
-#endif
-
/* Size of the temp buffer midcomms allocates on the stack.
We try to make this large enough so most messages fit.
FIXME: should sctp make this unnecessary? */
Index: linux/drivers/dlm/recover.c
===================================================================
--- linux.orig/drivers/dlm/recover.c
+++ linux/drivers/dlm/recover.c
@@ -420,7 +420,7 @@ int dlm_recover_master_reply(struct dlm_
r = recover_list_find(ls, rc->rc_id);
if (!r) {
- log_error(ls, "dlm_recover_master_reply no id %"PRIx64"",
+ log_error(ls, "dlm_recover_master_reply no id %llx",
rc->rc_id);
goto out;
}
Index: linux/drivers/dlm/recoverd.c
===================================================================
--- linux.orig/drivers/dlm/recoverd.c
+++ linux/drivers/dlm/recoverd.c
@@ -45,7 +45,7 @@ static int ls_recover(struct dlm_ls *ls,
unsigned long start;
int error, neg = 0;
- log_debug(ls, "recover %"PRIx64"", rv->seq);
+ log_debug(ls, "recover %llx", rv->seq);
down(&ls->ls_recoverd_active);
@@ -199,7 +199,7 @@ static int ls_recover(struct dlm_ls *ls,
dlm_astd_wake();
- log_debug(ls, "recover %"PRIx64" done: %u ms", rv->seq,
+ log_debug(ls, "recover %llx done: %u ms", rv->seq,
jiffies_to_msecs(jiffies - start));
up(&ls->ls_recoverd_active);
@@ -207,7 +207,7 @@ static int ls_recover(struct dlm_ls *ls,
fail:
dlm_release_root_list(ls);
- log_debug(ls, "recover %"PRIx64" error %d", rv->seq, error);
+ log_debug(ls, "recover %llx error %d", rv->seq, error);
up(&ls->ls_recoverd_active);
return error;
}
reply other threads:[~2006-01-19 21:31 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20060119213057.GE31387@redhat.com \
--to=teigland@redhat.com \
--cc=akpm@osdl.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.