Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

lockd: Remove C macros that are no longer used

The conversion of all NLMv4 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 "NLMv4 Server procedures".

Reviewed-by: Jeff Layton <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

+1 -10
+1 -10
fs/lockd/svc4proc.c
··· 26 26 #include "nlm4xdr_gen.h" 27 27 #include "xdr4.h" 28 28 29 - #define NLMDBG_FACILITY NLMDBG_CLIENT 30 - 31 29 /* 32 30 * Wrapper structures combine xdrgen types with legacy nlm_lock. 33 31 * The xdrgen field must be first so the structure can be cast ··· 1150 1152 1151 1153 1152 1154 /* 1153 - * NLM Server procedures. 1155 + * NLMv4 Server procedures. 1154 1156 */ 1155 - 1156 - struct nlm_void { int dummy; }; 1157 - 1158 - #define Ck (1+XDR_QUADLEN(NLM_MAXCOOKIELEN)) /* cookie */ 1159 - #define No (1+1024/4) /* netobj */ 1160 - #define St 1 /* status */ 1161 - #define Rg 4 /* range (offset + length) */ 1162 1157 1163 1158 static const struct svc_procedure nlm4svc_procedures[24] = { 1164 1159 [NLMPROC4_NULL] = {