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

Andy Shevchenko
2026-03-19T15:49:31Z

On Thu, Mar 19, 2026 at 10:59:02PM +0800, Sean Chang wrote:
> On Thu, Mar 19, 2026 at 10:41 PM Andy Shevchenko
> <andriy.shevchenko@intel.com> wrote:
> > On Thu, Mar 19, 2026 at 10:18:46PM +0800, Sean Chang wrote:

...

> > > #define nfs_invalf(fc, fmt, ...) ((fc)->log.log ? \
> > > invalf(fc, fmt, ## __VA_ARGS__) : \
> >
> > > invalf(fc, fmt, ## __VA_ARGS__) : \
> > > ({ dfprintk(fac, fmt "\n", ## __VA_ARGS__); -EINVAL; }))
> >
> > Why not all of them?
>
> I initially only refactored nfs_errorf because it doesn't return a value.
> For nfs_invalf, it will always return -EINVAL. Would you prefer me to
> refactor it using the ({ ... }) statement expression pattern to keep the
> return value, or is it better to leave it as is ?

I don't think in this case it improves the situation. Yeah, it's unfortunate.

> #define nfs_invalf(fc, fmt, ...) ({ \
> if ((fc)->log.log) \
> invalf(fc, fmt, ## __VA_ARGS__); \

I believe this already has an error code inside, that's why it's only added to
the 'else' branch.

> else \
> dfprintk(fac, fmt "\n", ## __VA_ARGS__);\
> -EINVAL; \
> })

Okay, let's go with your original approach (ideally these all probably should
be replaced by static inline:s).

Reviewed-by: Andy Shevchenko <andriy.shevchenko@intel.com>
Tested-by: Andy Shevchenko <andriy.shevchenko@intel.com>

Unrelated to the series, but if you want to address these:

nfs/super.c:1170:49: warning: incorrect type in initializer (different address spaces)
nfs/super.c:1170:49: expected struct rpc_xprt *xprt1
nfs/super.c:1170:49: got struct rpc_xprt [noderef] __rcu *cl_xprt
nfs/super.c:1171:49: warning: incorrect type in initializer (different address spaces)
nfs/super.c:1171:49: expected struct rpc_xprt *xprt2
nfs/super.c:1171:49: got struct rpc_xprt [noderef] __rcu *cl_xprt

nfs/./nfstrace.h:1488:1: warning: dereference of noderef expression
nfs/./nfs4trace.h:2168:1: error: too long token expansion
nfs/./nfs4trace.h:2234:1: error: too long token expansion

--
With Best Regards,
Andy Shevchenko