From: Chris Down <chris@chrisdown.name>
To: Jonathan Lassoff <jof@thejof.com>
Cc: linux-xfs@vger.kernel.org, "Darrick J. Wong" <djwong@kernel.org>,
Dave Chinner <david@fromorbit.com>,
Petr Mladek <pmladek@suse.com>,
Sergey Senozhatsky <senozhatsky@chromium.org>,
Steven Rostedt <rostedt@goodmis.org>,
John Ogness <john.ogness@linutronix.de>
Subject: Re: [PATCH v3 1/2] Simplify XFS logging methods.
Date: Wed, 30 Mar 2022 12:55:08 +0100 [thread overview]
Message-ID: <YkRFHNhFcfOAeOFV@chrisdown.name> (raw)
In-Reply-To: <3e1f6011b22ca87ea3c0fad701286369daa2187f.1648228733.git.jof@thejof.com>
Jonathan Lassoff writes:
>Rather than have a constructor to define many nearly-identical
>functions, use preprocessor macros to pass down a kernel logging level
>to a common function.
>
>Signed-off-by: Jonathan Lassoff <jof@thejof.com>
This is a good simplification, thanks.
Reviewed-by: Chris Down <chris@chrisdown.name>
>---
>
>Notes:
> [PATCH v1]
> * De-duplicate kernel logging levels and tidy whitespace.
> [PATCH v2]
> * Split changes into two patches:
> - function and prototype de-duplication.
> - Adding printk indexing
> [PATCH v3]
> * Fix some whitespace and semicolon. *facepalm*
>
> fs/xfs/xfs_message.c | 53 ++++++++++++++++++--------------------------
> fs/xfs/xfs_message.h | 47 +++++++++++++++++++++------------------
> 2 files changed, 47 insertions(+), 53 deletions(-)
>
>diff --git a/fs/xfs/xfs_message.c b/fs/xfs/xfs_message.c
>index bc66d95c8d4c..ede8a4f2f676 100644
>--- a/fs/xfs/xfs_message.c
>+++ b/fs/xfs/xfs_message.c
>@@ -27,37 +27,28 @@ __xfs_printk(
> printk("%sXFS: %pV\n", level, vaf);
> }
>
>-#define define_xfs_printk_level(func, kern_level) \
>-void func(const struct xfs_mount *mp, const char *fmt, ...) \
>-{ \
>- struct va_format vaf; \
>- va_list args; \
>- int level; \
>- \
>- va_start(args, fmt); \
>- \
>- vaf.fmt = fmt; \
>- vaf.va = &args; \
>- \
>- __xfs_printk(kern_level, mp, &vaf); \
>- va_end(args); \
>- \
>- if (!kstrtoint(kern_level, 0, &level) && \
>- level <= LOGLEVEL_ERR && \
>- xfs_error_level >= XFS_ERRLEVEL_HIGH) \
>- xfs_stack_trace(); \
>-} \
>-
>-define_xfs_printk_level(xfs_emerg, KERN_EMERG);
>-define_xfs_printk_level(xfs_alert, KERN_ALERT);
>-define_xfs_printk_level(xfs_crit, KERN_CRIT);
>-define_xfs_printk_level(xfs_err, KERN_ERR);
>-define_xfs_printk_level(xfs_warn, KERN_WARNING);
>-define_xfs_printk_level(xfs_notice, KERN_NOTICE);
>-define_xfs_printk_level(xfs_info, KERN_INFO);
>-#ifdef DEBUG
>-define_xfs_printk_level(xfs_debug, KERN_DEBUG);
>-#endif
>+void xfs_printk_level(
>+ const char *kern_level,
>+ const struct xfs_mount *mp,
>+ const char *fmt, ...)
>+{
>+ struct va_format vaf;
>+ va_list args;
>+ int level;
>+
>+ va_start(args, fmt);
>+ vaf.fmt = fmt;
>+ vaf.va = &args;
>+
>+ __xfs_printk(kern_level, mp, &vaf);
>+
>+ va_end(args);
>+
>+ if (!kstrtoint(kern_level, 0, &level) &&
>+ level <= LOGLEVEL_ERR &&
>+ xfs_error_level >= XFS_ERRLEVEL_HIGH)
>+ xfs_stack_trace();
>+}
>
> void
> xfs_alert_tag(
>diff --git a/fs/xfs/xfs_message.h b/fs/xfs/xfs_message.h
>index bb9860ec9a93..2f609800e806 100644
>--- a/fs/xfs/xfs_message.h
>+++ b/fs/xfs/xfs_message.h
>@@ -6,33 +6,36 @@
>
> struct xfs_mount;
>
>-extern __printf(2, 3)
>-void xfs_emerg(const struct xfs_mount *mp, const char *fmt, ...);
>-extern __printf(2, 3)
>-void xfs_alert(const struct xfs_mount *mp, const char *fmt, ...);
> extern __printf(3, 4)
>-void xfs_alert_tag(const struct xfs_mount *mp, int tag, const char *fmt, ...);
>-extern __printf(2, 3)
>-void xfs_crit(const struct xfs_mount *mp, const char *fmt, ...);
>-extern __printf(2, 3)
>-void xfs_err(const struct xfs_mount *mp, const char *fmt, ...);
>-extern __printf(2, 3)
>-void xfs_warn(const struct xfs_mount *mp, const char *fmt, ...);
>-extern __printf(2, 3)
>-void xfs_notice(const struct xfs_mount *mp, const char *fmt, ...);
>-extern __printf(2, 3)
>-void xfs_info(const struct xfs_mount *mp, const char *fmt, ...);
>-
>+void xfs_printk_level(
>+ const char *kern_level,
>+ const struct xfs_mount *mp,
>+ const char *fmt, ...);
>+#define xfs_emerg(mp, fmt, ...) \
>+ xfs_printk_level(KERN_EMERG, mp, fmt, ##__VA_ARGS__)
>+#define xfs_alert(mp, fmt, ...) \
>+ xfs_printk_level(KERN_ALERT, mp, fmt, ##__VA_ARGS__)
>+#define xfs_crit(mp, fmt, ...) \
>+ xfs_printk_level(KERN_CRIT, mp, fmt, ##__VA_ARGS__)
>+#define xfs_err(mp, fmt, ...) \
>+ xfs_printk_level(KERN_ERR, mp, fmt, ##__VA_ARGS__)
>+#define xfs_warn(mp, fmt, ...) \
>+ xfs_printk_level(KERN_WARNING, mp, fmt, ##__VA_ARGS__)
>+#define xfs_notice(mp, fmt, ...) \
>+ xfs_printk_level(KERN_NOTICE, mp, fmt, ##__VA_ARGS__)
>+#define xfs_info(mp, fmt, ...) \
>+ xfs_printk_level(KERN_INFO, mp, fmt, ##__VA_ARGS__)
> #ifdef DEBUG
>-extern __printf(2, 3)
>-void xfs_debug(const struct xfs_mount *mp, const char *fmt, ...);
>+#define xfs_debug(mp, fmt, ...) \
>+ xfs_printk_level(KERN_DEBUG, mp, fmt, ##__VA_ARGS__)
> #else
>-static inline __printf(2, 3)
>-void xfs_debug(const struct xfs_mount *mp, const char *fmt, ...)
>-{
>-}
>+#define xfs_debug(mp, fmt, ...) do {} while (0)
> #endif
>
>+extern __printf(3, 4)
>+void xfs_alert_tag(const struct xfs_mount *mp, int tag, const char *fmt, ...);
>+
>+
> #define xfs_printk_ratelimited(func, dev, fmt, ...) \
> do { \
> static DEFINE_RATELIMIT_STATE(_rs, \
>
>base-commit: 34af78c4e616c359ed428d79fe4758a35d2c5473
>--
>2.35.1
>
prev parent reply other threads:[~2022-03-30 11:58 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-03-25 17:19 [PATCH v3 1/2] Simplify XFS logging methods Jonathan Lassoff
2022-03-25 17:19 ` [PATCH v3 2/2] Add XFS messages to printk index Jonathan Lassoff
2022-03-29 13:34 ` Petr Mladek
2022-03-30 0:34 ` Dave Chinner
2022-03-30 0:46 ` Darrick J. Wong
2022-03-30 1:26 ` Dave Chinner
2022-03-30 14:59 ` Petr Mladek
2022-03-30 15:07 ` Chris Down
2022-03-31 15:06 ` Darrick J. Wong
2022-04-05 12:55 ` Petr Mladek
2022-03-31 9:14 ` Sergey Senozhatsky
2022-03-30 11:52 ` Chris Down
2022-03-30 16:47 ` Steven Rostedt
2022-03-30 17:09 ` Chris Down
2022-03-30 17:25 ` Chris Down
2022-03-30 17:39 ` Steven Rostedt
2022-03-30 17:44 ` Chris Down
2022-03-30 21:02 ` Dave Chinner
2022-03-31 14:09 ` Petr Mladek
2022-04-01 21:50 ` Dave Chinner
2022-03-30 12:05 ` Chris Down
2022-03-30 0:05 ` Dave Chinner
2022-03-30 12:07 ` Chris Down
2022-03-31 1:38 ` Jonathan Lassoff
2022-03-29 13:03 ` [PATCH v3 1/2] Simplify XFS logging methods Petr Mladek
2022-03-29 23:54 ` Dave Chinner
2022-03-30 11:40 ` Petr Mladek
2022-03-30 11:55 ` Chris Down [this message]
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=YkRFHNhFcfOAeOFV@chrisdown.name \
--to=chris@chrisdown.name \
--cc=david@fromorbit.com \
--cc=djwong@kernel.org \
--cc=jof@thejof.com \
--cc=john.ogness@linutronix.de \
--cc=linux-xfs@vger.kernel.org \
--cc=pmladek@suse.com \
--cc=rostedt@goodmis.org \
--cc=senozhatsky@chromium.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).