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 <jlayton@kernel.org>
Signed-off-by: Chuck Lever <chuck.lever@oracle.com>

diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index ef1ae701b43b3235c77e17499dca93c9fbe78937..f62b0b39c5e98e6c017dcbadc10587c139703d59 100644 (file)
--- 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 @@ out:
 }
 
 /*
- * 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,