When CONFIG_SUNRPC_DEBUG is disabled, the dprintk() macro expands to an empty do-while loop. This causes variables used solely within dprintk() calls to appear unused to the compiler, triggering -Wunused-variable warnings. Fix this by adding __maybe_unused to the affected variables. This ensures the code builds cleanly across different configurations, including RISC-V, ARM, and ARM64 allmodconfig, as verified in the mailing list discussion. Signed-off-by: Sean Chang --- fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- fs/nfs/flexfilelayout/flexfilelayoutdev.c | 3 ++- fs/nfs/nfs4proc.c | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/fs/nfs/flexfilelayout/flexfilelayout.c b/fs/nfs/flexfilelayout/flexfilelayout.c index 9056f05a67dc..de9e8bad6af2 100644 --- a/fs/nfs/flexfilelayout/flexfilelayout.c +++ b/fs/nfs/flexfilelayout/flexfilelayout.c @@ -1502,7 +1502,7 @@ static void ff_layout_io_track_ds_error(struct pnfs_layout_segment *lseg, { struct nfs4_ff_layout_mirror *mirror; u32 status = *op_status; - int err; + int err __maybe_unused; if (status == 0) { switch (error) { diff --git a/fs/nfs/flexfilelayout/flexfilelayoutdev.c b/fs/nfs/flexfilelayout/flexfilelayoutdev.c index c2d8a13a9dbd..3fb8dba0abf5 100644 --- a/fs/nfs/flexfilelayout/flexfilelayoutdev.c +++ b/fs/nfs/flexfilelayout/flexfilelayoutdev.c @@ -53,7 +53,8 @@ nfs4_ff_alloc_deviceid_node(struct nfs_server *server, struct pnfs_device *pdev, u32 mp_count; u32 version_count; __be32 *p; - int i, ret = -ENOMEM; + int i; + int ret __maybe_unused = -ENOMEM; /* set up xdr stream */ scratch = folio_alloc(gfp_flags, 0); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 180229320731..f76c23cdc888 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -9241,7 +9241,7 @@ static int _nfs4_proc_create_session(struct nfs_client *clp, int nfs4_proc_create_session(struct nfs_client *clp, const struct cred *cred) { int status; - unsigned *ptr; + unsigned *ptr __maybe_unused; struct nfs4_session *session = clp->cl_session; struct nfs4_add_xprt_data xprtdata = { .clp = clp, -- 2.34.1