From: David Howells <dhowells@redhat.com>
To: bfields@fieldses.org, Trond.Myklebust@netapp.com
Cc: olof@lixom.net, linux-nfs@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH 1/4] SunRPC: Use the standard varargs macro method for dfprintk() and co.
Date: Thu, 26 Sep 2013 15:45:10 +0100 [thread overview]
Message-ID: <20130926144510.29424.40094.stgit@warthog.procyon.org.uk> (raw)
In-Reply-To: <20130926144502.29424.21633.stgit@warthog.procyon.org.uk>
Use the standard varargs macro method rather than the old gcc method for
dfprintk() and co.
Signed-off-by: David Howells <dhowells@redhat.com>
---
include/linux/sunrpc/debug.h | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/include/linux/sunrpc/debug.h b/include/linux/sunrpc/debug.h
index 9385bd7..889474b 100644
--- a/include/linux/sunrpc/debug.h
+++ b/include/linux/sunrpc/debug.h
@@ -32,33 +32,33 @@ extern unsigned int nfsd_debug;
extern unsigned int nlm_debug;
#endif
-#define dprintk(args...) dfprintk(FACILITY, ## args)
-#define dprintk_rcu(args...) dfprintk_rcu(FACILITY, ## args)
+#define dprintk(fmt, ...) dfprintk(FACILITY, fmt, ## __VA_ARGS__)
+#define dprintk_rcu(fmt, ...) dfprintk_rcu(FACILITY, fmt, ## __VA_ARGS__)
#undef ifdebug
#ifdef RPC_DEBUG
# define ifdebug(fac) if (unlikely(rpc_debug & RPCDBG_##fac))
-# define dfprintk(fac, args...) \
+# define dfprintk(fac, fmt, ...) \
do { \
ifdebug(fac) \
- printk(KERN_DEFAULT args); \
+ printk(KERN_DEFAULT fmt, ##__VA_ARGS__); \
} while (0)
-# define dfprintk_rcu(fac, args...) \
+# define dfprintk_rcu(fac, fmt, ...) \
do { \
ifdebug(fac) { \
rcu_read_lock(); \
- printk(KERN_DEFAULT args); \
+ printk(KERN_DEFAULT fmt, ##__VA_ARGS__); \
rcu_read_unlock(); \
} \
} while (0)
# define RPC_IFDEBUG(x) x
#else
-# define ifdebug(fac) if (0)
-# define dfprintk(fac, args...) do {} while (0)
-# define dfprintk_rcu(fac, args...) do {} while (0)
+# define ifdebug(fac) if (0)
+# define dfprintk(fac, fmt, ...) do {} while (0)
+# define dfprintk_rcu(fac, fmt, ...) do {} while (0)
# define RPC_IFDEBUG(x)
#endif
next prev parent reply other threads:[~2013-09-26 14:45 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-09-26 14:45 [RFC][PATCH 0/4] SunRPC/NFS: Use no_printk() in David Howells
2013-09-26 14:45 ` David Howells [this message]
2013-09-26 14:45 ` [PATCH 2/4] SunRPC: Declare and use rpc_task_pid() to wrap task->tk_pid David Howells
2013-09-26 14:45 ` [PATCH 3/4] SunRPC: Use no_printk() for the null dprintk() and dfprintk() David Howells
2013-09-26 15:30 ` Joe Perches
2013-09-26 15:35 ` David Howells
2013-09-26 15:38 ` Joe Perches
2013-09-26 15:42 ` Myklebust, Trond
2013-09-26 15:42 ` David Howells
2013-09-26 14:45 ` [PATCH 4/4] SunRPC: Kill RPC_IFDEBUG() and NFS_IFDEBUG() David Howells
2013-09-26 14:48 ` [PATCH 2/4] SunRPC: Declare and use rpc_task_pid() to wrap task->tk_pid David Howells
2013-09-26 15:21 ` [RFC][PATCH 0/4] SunRPC/NFS: Use no_printk() in J. Bruce Fields
2013-09-26 15:23 ` Myklebust, Trond
2013-09-26 15:27 ` David Howells
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=20130926144510.29424.40094.stgit@warthog.procyon.org.uk \
--to=dhowells@redhat.com \
--cc=Trond.Myklebust@netapp.com \
--cc=bfields@fieldses.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=olof@lixom.net \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®