From 5c0d3a859ba6d66eb3b587fae1ad81ce518d9bd0 Mon Sep 17 00:00:00 2001 From: Chuck Lever Date: Tue, 12 May 2026 14:14:11 -0400 Subject: [PATCH] lockd: Remove C macros that are no longer used The conversion of all NLMv3 procedures to xdrgen-generated XDR functions is complete. The hand-rolled XDR size calculation macros (Ck, No, St, Rg) and the nlm_void structure definition served only the older implementations and are now unused. Also removes NLMDBG_FACILITY, which was set to the client debug flag in server-side code but never referenced, and corrects a comment to specify "NLMv3 Server procedures". Reviewed-by: Jeff Layton Signed-off-by: Chuck Lever --- fs/lockd/svcproc.c | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c index ef1ae701b43b..f62b0b39c5e9 100644 --- a/fs/lockd/svcproc.c +++ b/fs/lockd/svcproc.c @@ -24,8 +24,6 @@ #include "share.h" #include "nlm3xdr_gen.h" -#define NLMDBG_FACILITY NLMDBG_CLIENT - /* * Size of an NFSv2 file handle, in bytes, which is 32. * Defined locally to avoid including uapi/linux/nfs2.h. @@ -1188,16 +1186,9 @@ static __be32 nlmsvc_proc_free_all(struct svc_rqst *rqstp) } /* - * NLM Server procedures. + * NLMv3 Server procedures. */ -struct nlm_void { int dummy; }; - -#define Ck (1+XDR_QUADLEN(NLM_MAXCOOKIELEN)) /* cookie */ -#define St 1 /* status */ -#define No (1+1024/4) /* Net Obj */ -#define Rg 2 /* range - offset + size */ - static const struct svc_procedure nlmsvc_procedures[24] = { [NLM_NULL] = { .pc_func = nlmsvc_proc_null,