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>

diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index ce340ea0d304d99f9e3fdd26bf60ae8e88b47554..4044459b7c493be32bc9440572f39a0bc7a6cfc4 100644 (file)
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -26,8 +26,6 @@
 #include "nlm4xdr_gen.h"
 #include "xdr4.h"
 
-#define NLMDBG_FACILITY                NLMDBG_CLIENT
-
 /*
  * Wrapper structures combine xdrgen types with legacy nlm_lock.
  * The xdrgen field must be first so the structure can be cast
@@ -1152,16 +1150,9 @@ out:
 
 
 /*
- * NLM Server procedures.
+ * NLMv4 Server procedures.
  */
 
-struct nlm_void                        { int dummy; };
-
-#define        Ck      (1+XDR_QUADLEN(NLM_MAXCOOKIELEN))       /* cookie */
-#define        No      (1+1024/4)                              /* netobj */
-#define        St      1                                       /* status */
-#define        Rg      4                                       /* range (offset + length) */
-
 static const struct svc_procedure nlm4svc_procedures[24] = {
        [NLMPROC4_NULL] = {
                .pc_func        = nlm4svc_proc_null,