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,