From: Sean Chang <seanwascoding@gmail.com>
To: Andrew Lunn <andrew@lunn.ch>,
Chuck Lever <chuck.lever@oracle.com>,
David Laight <david.laight.linux@gmail.com>,
Anna Schumaker <anna@kernel.org>,
Andy Shevchenko <andriy.shevchenko@intel.com>
Cc: netdev@vger.kernel.org, linux-nfs@vger.kernel.org,
linux-kernel@vger.kernel.org,
Sean Chang <seanwascoding@gmail.com>,
kernel test robot <lkp@intel.com>
Subject: [PATCH v5 4/5] nfs: Refactor nfs_errorf macros and remove unused ones
Date: Sat, 21 Mar 2026 22:15:09 +0800 [thread overview]
Message-ID: <20260321141510.68214-5-seanwascoding@gmail.com> (raw)
In-Reply-To: <20260321141510.68214-1-seanwascoding@gmail.com>
Refactor nfs_errorf() and nfs_ferrorf() to the standard do-while(0)
pattern for safer macro expansion and kernel style compliance.
Additionally, remove nfs_warnf() and nfs_fwarnf() as `git grep`
confirms they have no callers in the current tree. Furthermore,
these functions have remained unused since the introduction in
commit ce8866f0913f ("NFS: Attach supplementary error information
to fs_context.").
Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202603110038.P6d14oxa-lkp@intel.com/
Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Tested-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Signed-off-by: Sean Chang <seanwascoding@gmail.com>
---
fs/nfs/internal.h | 28 +++++++++++++---------------
1 file changed, 13 insertions(+), 15 deletions(-)
diff --git a/fs/nfs/internal.h b/fs/nfs/internal.h
index 63e09dfc27a8..59ab43542390 100644
--- a/fs/nfs/internal.h
+++ b/fs/nfs/internal.h
@@ -161,13 +161,19 @@ enum nfs_lock_status {
NFS_LOCK_NOLOCK = 2,
};
-#define nfs_errorf(fc, fmt, ...) ((fc)->log.log ? \
- errorf(fc, fmt, ## __VA_ARGS__) : \
- ({ dprintk(fmt "\n", ## __VA_ARGS__); }))
-
-#define nfs_ferrorf(fc, fac, fmt, ...) ((fc)->log.log ? \
- errorf(fc, fmt, ## __VA_ARGS__) : \
- ({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); }))
+#define nfs_errorf(fc, fmt, ...) do { \
+ if ((fc)->log.log) \
+ errorf(fc, fmt, ## __VA_ARGS__); \
+ else \
+ dprintk(fmt "\n", ## __VA_ARGS__); \
+} while (0)
+
+#define nfs_ferrorf(fc, fac, fmt, ...) do { \
+ if ((fc)->log.log) \
+ errorf(fc, fmt, ## __VA_ARGS__); \
+ else \
+ dfprintk(fac, fmt "\n", ## __VA_ARGS__); \
+} while (0)
#define nfs_invalf(fc, fmt, ...) ((fc)->log.log ? \
invalf(fc, fmt, ## __VA_ARGS__) : \
@@ -177,14 +183,6 @@ enum nfs_lock_status {
invalf(fc, fmt, ## __VA_ARGS__) : \
({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); -EINVAL; }))
-#define nfs_warnf(fc, fmt, ...) ((fc)->log.log ? \
- warnf(fc, fmt, ## __VA_ARGS__) : \
- ({ dprintk(fmt "\n", ## __VA_ARGS__); }))
-
-#define nfs_fwarnf(fc, fac, fmt, ...) ((fc)->log.log ? \
- warnf(fc, fmt, ## __VA_ARGS__) : \
- ({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); }))
-
static inline struct nfs_fs_context *nfs_fc2context(const struct fs_context *fc)
{
return fc->fs_private;
--
2.34.1
next prev parent reply other threads:[~2026-03-21 14:15 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-03-21 14:15 [PATCH v5 0/5] sunrpc/nfs: cleanup redundant debug checks and refactor macros Sean Chang
2026-03-21 14:15 ` [PATCH v5 1/5] sunrpc: Fix dprintk type mismatch using do-while(0) Sean Chang
2026-03-21 16:37 ` Chuck Lever
2026-03-25 15:49 ` Sean Chang
2026-03-21 14:15 ` [PATCH v5 2/5] nfsd/lockd: Remove redundant debug checks Sean Chang
2026-03-21 14:15 ` [PATCH v5 3/5] svcrdma: Remove redundant IS_ENABLED(CONFIG_SUNRPC_DEBUG) guards Sean Chang
2026-03-21 14:15 ` Sean Chang [this message]
2026-03-21 16:38 ` [PATCH v5 4/5] nfs: Refactor nfs_errorf macros and remove unused ones Chuck Lever
2026-03-25 16:11 ` Sean Chang
2026-03-21 14:15 ` [PATCH v5 5/5] Revert "nfsd: Mark variable __maybe_unused to avoid W=1 build break" Sean Chang
2026-03-21 16:38 ` Chuck Lever
2026-03-25 16:39 ` Sean Chang
2026-03-23 13:25 ` [PATCH v5 0/5] sunrpc/nfs: cleanup redundant debug checks and refactor macros Jeff Layton
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=20260321141510.68214-5-seanwascoding@gmail.com \
--to=seanwascoding@gmail.com \
--cc=andrew@lunn.ch \
--cc=andriy.shevchenko@intel.com \
--cc=anna@kernel.org \
--cc=chuck.lever@oracle.com \
--cc=david.laight.linux@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-nfs@vger.kernel.org \
--cc=lkp@intel.com \
--cc=netdev@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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox