[PATCH v3 3/3] nfs: refactor nfs_errorf macros and remove unused ones

Sean Chang
2026-03-19T14:19:05Z

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.

Reported-by: kernel test robot <lkp@intel.com>
Closes: https://lore.kernel.org/oe-kbuild-all/202603110038.P6d14oxa-lkp@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