lockd: Rename struct nlm_res to lockd_res

As part of the effort to enable lockd's server-side XDR functions to
be generated from the NLM protocol specification (using xdrgen), the
internal type names must be changed to avoid conflicts with the
machine-generated type names.

Rename struct nlm_res to struct lockd_res to avoid conflicts with
the NLMv3 XDR type definitions that will be introduced when svcproc.c
is converted to use xdrgen.

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

8 files changed, 59 insertions, 59 deletions

diff --git a/fs/lockd/clnt4xdr.c b/fs/lockd/clnt4xdr.c
index d0b08a12fe45..96a4a1e6a6b6 100644
--- a/fs/lockd/clnt4xdr.c
+++ b/fs/lockd/clnt4xdr.c
@@ -238,7 +238,7 @@ out_overflow:
  *	};
  */
 static void encode_nlm4_holder(struct xdr_stream *xdr,
-			       const struct nlm_res *result)
+			       const struct lockd_res *result)
 {
 	const struct lockd_lock *lock = &result->lock;
 	u64 l_offset, l_len;
@@ -254,7 +254,7 @@ static void encode_nlm4_holder(struct xdr_stream *xdr,
 	xdr_encode_hyper(p, l_len);
 }
 
-static int decode_nlm4_holder(struct xdr_stream *xdr, struct nlm_res *result)
+static int decode_nlm4_holder(struct xdr_stream *xdr, struct lockd_res *result)
 {
 	struct lockd_lock *lock = &result->lock;
 	struct file_lock *fl = &lock->fl;
@@ -435,7 +435,7 @@ static void nlm4_xdr_enc_res(struct rpc_rqst *req,
 			     struct xdr_stream *xdr,
 			     const void *data)
 {
-	const struct nlm_res *result = data;
+	const struct lockd_res *result = data;
 
 	encode_cookie(xdr, &result->cookie);
 	encode_nlm4_stat(xdr, result->status);
@@ -458,7 +458,7 @@ static void nlm4_xdr_enc_testres(struct rpc_rqst *req,
 				 struct xdr_stream *xdr,
 				 const void *data)
 {
-	const struct nlm_res *result = data;
+	const struct lockd_res *result = data;
 
 	encode_cookie(xdr, &result->cookie);
 	encode_nlm4_stat(xdr, result->status);
@@ -489,7 +489,7 @@ static void nlm4_xdr_enc_testres(struct rpc_rqst *req,
  *	};
  */
 static int decode_nlm4_testrply(struct xdr_stream *xdr,
-				struct nlm_res *result)
+				struct lockd_res *result)
 {
 	int error;
 
@@ -506,7 +506,7 @@ static int nlm4_xdr_dec_testres(struct rpc_rqst *req,
 				struct xdr_stream *xdr,
 				void *data)
 {
-	struct nlm_res *result = data;
+	struct lockd_res *result = data;
 	int error;
 
 	error = decode_cookie(xdr, &result->cookie);
@@ -527,7 +527,7 @@ static int nlm4_xdr_dec_res(struct rpc_rqst *req,
 			    struct xdr_stream *xdr,
 			    void *data)
 {
-	struct nlm_res *result = data;
+	struct lockd_res *result = data;
 	int error;
 
 	error = decode_cookie(xdr, &result->cookie);
diff --git a/fs/lockd/clntproc.c b/fs/lockd/clntproc.c
index abdf2a51caf2..f06faf577cea 100644
--- a/fs/lockd/clntproc.c
+++ b/fs/lockd/clntproc.c
@@ -267,7 +267,7 @@ nlmclnt_call(const struct cred *cred, struct nlm_rqst *req, u32 proc)
 	struct nlm_host	*host = req->a_host;
 	struct rpc_clnt	*clnt;
 	struct lockd_args *argp = &req->a_args;
-	struct nlm_res	*resp = &req->a_res;
+	struct lockd_res *resp = &req->a_res;
 	struct rpc_message msg = {
 		.rpc_argp	= argp,
 		.rpc_resp	= resp,
@@ -523,7 +523,7 @@ nlmclnt_lock(struct nlm_rqst *req, struct file_lock *fl)
 {
 	const struct cred *cred = nfs_file_cred(fl->c.flc_file);
 	struct nlm_host	*host = req->a_host;
-	struct nlm_res	*resp = &req->a_res;
+	struct lockd_res *resp = &req->a_res;
 	struct nlm_wait block;
 	unsigned char flags = fl->c.flc_flags;
 	unsigned char type;
@@ -686,7 +686,7 @@ static int
 nlmclnt_unlock(struct nlm_rqst *req, struct file_lock *fl)
 {
 	struct nlm_host	*host = req->a_host;
-	struct nlm_res	*resp = &req->a_res;
+	struct lockd_res *resp = &req->a_res;
 	int status;
 	unsigned char flags = fl->c.flc_flags;
 
diff --git a/fs/lockd/clntxdr.c b/fs/lockd/clntxdr.c
index 444a34bc799a..3789ecb0b984 100644
--- a/fs/lockd/clntxdr.c
+++ b/fs/lockd/clntxdr.c
@@ -234,7 +234,7 @@ out_overflow:
  *	};
  */
 static void encode_nlm_holder(struct xdr_stream *xdr,
-			      const struct nlm_res *result)
+			      const struct lockd_res *result)
 {
 	const struct lockd_lock *lock = &result->lock;
 	u32 l_offset, l_len;
@@ -250,7 +250,7 @@ static void encode_nlm_holder(struct xdr_stream *xdr,
 	*p   = cpu_to_be32(l_len);
 }
 
-static int decode_nlm_holder(struct xdr_stream *xdr, struct nlm_res *result)
+static int decode_nlm_holder(struct xdr_stream *xdr, struct lockd_res *result)
 {
 	struct lockd_lock *lock = &result->lock;
 	struct file_lock *fl = &lock->fl;
@@ -436,7 +436,7 @@ static void nlm_xdr_enc_res(struct rpc_rqst *req,
 			    struct xdr_stream *xdr,
 			    const void *data)
 {
-	const struct nlm_res *result = data;
+	const struct lockd_res *result = data;
 
 	encode_cookie(xdr, &result->cookie);
 	encode_nlm_stat(xdr, result->status);
@@ -456,7 +456,7 @@ static void nlm_xdr_enc_res(struct rpc_rqst *req,
  *	};
  */
 static void encode_nlm_testrply(struct xdr_stream *xdr,
-				const struct nlm_res *result)
+				const struct lockd_res *result)
 {
 	if (result->status == nlm_lck_denied)
 		encode_nlm_holder(xdr, result);
@@ -466,7 +466,7 @@ static void nlm_xdr_enc_testres(struct rpc_rqst *req,
 				struct xdr_stream *xdr,
 				const void *data)
 {
-	const struct nlm_res *result = data;
+	const struct lockd_res *result = data;
 
 	encode_cookie(xdr, &result->cookie);
 	encode_nlm_stat(xdr, result->status);
@@ -495,7 +495,7 @@ static void nlm_xdr_enc_testres(struct rpc_rqst *req,
  *	};
  */
 static int decode_nlm_testrply(struct xdr_stream *xdr,
-			       struct nlm_res *result)
+			       struct lockd_res *result)
 {
 	int error;
 
@@ -512,7 +512,7 @@ static int nlm_xdr_dec_testres(struct rpc_rqst *req,
 			       struct xdr_stream *xdr,
 			       void *data)
 {
-	struct nlm_res *result = data;
+	struct lockd_res *result = data;
 	int error;
 
 	error = decode_cookie(xdr, &result->cookie);
@@ -533,7 +533,7 @@ static int nlm_xdr_dec_res(struct rpc_rqst *req,
 			   struct xdr_stream *xdr,
 			   void *data)
 {
-	struct nlm_res *result = data;
+	struct lockd_res *result = data;
 	int error;
 
 	error = decode_cookie(xdr, &result->cookie);
diff --git a/fs/lockd/lockd.h b/fs/lockd/lockd.h
index a97676639d3e..4054e97723d8 100644
--- a/fs/lockd/lockd.h
+++ b/fs/lockd/lockd.h
@@ -172,7 +172,7 @@ struct nlm_rqst {
 	unsigned int		a_flags;	/* initial RPC task flags */
 	struct nlm_host *	a_host;		/* host handle */
 	struct lockd_args	a_args;		/* arguments */
-	struct nlm_res		a_res;		/* result */
+	struct lockd_res	a_res;		/* result */
 	struct nlm_block *	a_block;
 	unsigned int		a_retries;	/* Retry count */
 	u8			a_owner[NLMCLNT_OHSIZE];
diff --git a/fs/lockd/svc4proc.c b/fs/lockd/svc4proc.c
index f7067fae6c86..1682a7c91a78 100644
--- a/fs/lockd/svc4proc.c
+++ b/fs/lockd/svc4proc.c
@@ -562,7 +562,7 @@ static const struct rpc_call_ops nlm4svc_callback_ops = {
  */
 static __be32
 nlm4svc_callback(struct svc_rqst *rqstp, struct nlm_host *host, u32 proc,
-		 __be32 (*func)(struct svc_rqst *,  struct nlm_res *))
+		 __be32 (*func)(struct svc_rqst *,  struct lockd_res *))
 {
 	struct nlm_rqst	*call;
 	__be32 stat;
@@ -585,7 +585,7 @@ nlm4svc_callback(struct svc_rqst *rqstp, struct nlm_host *host, u32 proc,
 }
 
 static __be32
-__nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlm4svc_proc_test_msg(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct nlm4_testargs_wrapper *argp = rqstp->rq_argp;
 	unsigned char type = argp->xdrgen.exclusive ? F_WRLCK : F_RDLCK;
@@ -645,7 +645,7 @@ static __be32 nlm4svc_proc_test_msg(struct svc_rqst *rqstp)
 }
 
 static __be32
-__nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlm4svc_proc_lock_msg(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct nlm4_lockargs_wrapper *argp = rqstp->rq_argp;
 	unsigned char type = argp->xdrgen.exclusive ? F_WRLCK : F_RDLCK;
@@ -707,7 +707,7 @@ static __be32 nlm4svc_proc_lock_msg(struct svc_rqst *rqstp)
 }
 
 static __be32
-__nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct nlm4_cancargs_wrapper *argp = rqstp->rq_argp;
 	unsigned char type = argp->xdrgen.exclusive ? F_WRLCK : F_RDLCK;
@@ -771,7 +771,7 @@ static __be32 nlm4svc_proc_cancel_msg(struct svc_rqst *rqstp)
 }
 
 static __be32
-__nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct nlm4_unlockargs_wrapper *argp = rqstp->rq_argp;
 	struct net *net = SVC_NET(rqstp);
@@ -834,7 +834,7 @@ static __be32 nlm4svc_proc_unlock_msg(struct svc_rqst *rqstp)
 }
 
 static __be32
-__nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlm4svc_proc_granted_msg(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct nlm4_testargs_wrapper *argp = rqstp->rq_argp;
 
diff --git a/fs/lockd/svcproc.c b/fs/lockd/svcproc.c
index 8a49b864f6ee..e033320b840f 100644
--- a/fs/lockd/svcproc.c
+++ b/fs/lockd/svcproc.c
@@ -134,7 +134,7 @@ nlmsvc_proc_null(struct svc_rqst *rqstp)
  * TEST: Check for conflicting lock
  */
 static __be32
-__nlmsvc_proc_test(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlmsvc_proc_test(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
 	struct nlm_host	*host;
@@ -171,7 +171,7 @@ nlmsvc_proc_test(struct svc_rqst *rqstp)
 }
 
 static __be32
-__nlmsvc_proc_lock(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlmsvc_proc_lock(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
 	struct nlm_host	*host;
@@ -209,7 +209,7 @@ nlmsvc_proc_lock(struct svc_rqst *rqstp)
 }
 
 static __be32
-__nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlmsvc_proc_cancel(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
 	struct nlm_host	*host;
@@ -251,7 +251,7 @@ nlmsvc_proc_cancel(struct svc_rqst *rqstp)
  * UNLOCK: release a lock
  */
 static __be32
-__nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlmsvc_proc_unlock(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
 	struct nlm_host	*host;
@@ -294,7 +294,7 @@ nlmsvc_proc_unlock(struct svc_rqst *rqstp)
  * was granted
  */
 static __be32
-__nlmsvc_proc_granted(struct svc_rqst *rqstp, struct nlm_res *resp)
+__nlmsvc_proc_granted(struct svc_rqst *rqstp, struct lockd_res *resp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
 
@@ -343,7 +343,7 @@ static const struct rpc_call_ops nlmsvc_callback_ops = {
  * doesn't break any clients.
  */
 static __be32 nlmsvc_callback(struct svc_rqst *rqstp, u32 proc,
-		__be32 (*func)(struct svc_rqst *, struct nlm_res *))
+		__be32 (*func)(struct svc_rqst *, struct lockd_res *))
 {
 	struct lockd_args *argp = rqstp->rq_argp;
 	struct nlm_host	*host;
@@ -412,7 +412,7 @@ static __be32
 nlmsvc_proc_share(struct svc_rqst *rqstp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
-	struct nlm_res *resp = rqstp->rq_resp;
+	struct lockd_res *resp = rqstp->rq_resp;
 	struct nlm_host	*host;
 	struct nlm_file	*file;
 
@@ -450,7 +450,7 @@ static __be32
 nlmsvc_proc_unshare(struct svc_rqst *rqstp)
 {
 	struct lockd_args *argp = rqstp->rq_argp;
-	struct nlm_res *resp = rqstp->rq_resp;
+	struct lockd_res *resp = rqstp->rq_resp;
 	struct nlm_host	*host;
 	struct nlm_file	*file;
 
@@ -539,7 +539,7 @@ nlmsvc_proc_sm_notify(struct svc_rqst *rqstp)
 static __be32
 nlmsvc_proc_granted_res(struct svc_rqst *rqstp)
 {
-	struct nlm_res *argp = rqstp->rq_argp;
+	struct lockd_res *argp = rqstp->rq_argp;
 
 	if (!nlmsvc_ops)
 		return rpc_success;
@@ -584,7 +584,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_testres,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St+2+No+Rg,
 		.pc_name = "TEST",
 	},
@@ -594,7 +594,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_res,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St,
 		.pc_name = "LOCK",
 	},
@@ -604,7 +604,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_res,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St,
 		.pc_name = "CANCEL",
 	},
@@ -614,7 +614,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_res,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St,
 		.pc_name = "UNLOCK",
 	},
@@ -624,7 +624,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_res,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St,
 		.pc_name = "GRANTED",
 	},
@@ -682,8 +682,8 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_func = nlmsvc_proc_null,
 		.pc_decode = nlmsvc_decode_void,
 		.pc_encode = nlmsvc_encode_void,
-		.pc_argsize = sizeof(struct nlm_res),
-		.pc_argzero = sizeof(struct nlm_res),
+		.pc_argsize = sizeof(struct lockd_res),
+		.pc_argzero = sizeof(struct lockd_res),
 		.pc_ressize = sizeof(struct nlm_void),
 		.pc_xdrressize = St,
 		.pc_name = "TEST_RES",
@@ -692,8 +692,8 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_func = nlmsvc_proc_null,
 		.pc_decode = nlmsvc_decode_void,
 		.pc_encode = nlmsvc_encode_void,
-		.pc_argsize = sizeof(struct nlm_res),
-		.pc_argzero = sizeof(struct nlm_res),
+		.pc_argsize = sizeof(struct lockd_res),
+		.pc_argzero = sizeof(struct lockd_res),
 		.pc_ressize = sizeof(struct nlm_void),
 		.pc_xdrressize = St,
 		.pc_name = "LOCK_RES",
@@ -702,8 +702,8 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_func = nlmsvc_proc_null,
 		.pc_decode = nlmsvc_decode_void,
 		.pc_encode = nlmsvc_encode_void,
-		.pc_argsize = sizeof(struct nlm_res),
-		.pc_argzero = sizeof(struct nlm_res),
+		.pc_argsize = sizeof(struct lockd_res),
+		.pc_argzero = sizeof(struct lockd_res),
 		.pc_ressize = sizeof(struct nlm_void),
 		.pc_xdrressize = St,
 		.pc_name = "CANCEL_RES",
@@ -712,8 +712,8 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_func = nlmsvc_proc_null,
 		.pc_decode = nlmsvc_decode_void,
 		.pc_encode = nlmsvc_encode_void,
-		.pc_argsize = sizeof(struct nlm_res),
-		.pc_argzero = sizeof(struct nlm_res),
+		.pc_argsize = sizeof(struct lockd_res),
+		.pc_argzero = sizeof(struct lockd_res),
 		.pc_ressize = sizeof(struct nlm_void),
 		.pc_xdrressize = St,
 		.pc_name = "UNLOCK_RES",
@@ -722,8 +722,8 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_func = nlmsvc_proc_granted_res,
 		.pc_decode = nlmsvc_decode_res,
 		.pc_encode = nlmsvc_encode_void,
-		.pc_argsize = sizeof(struct nlm_res),
-		.pc_argzero = sizeof(struct nlm_res),
+		.pc_argsize = sizeof(struct lockd_res),
+		.pc_argzero = sizeof(struct lockd_res),
 		.pc_ressize = sizeof(struct nlm_void),
 		.pc_xdrressize = St,
 		.pc_name = "GRANTED_RES",
@@ -774,7 +774,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_shareres,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St+1,
 		.pc_name = "SHARE",
 	},
@@ -784,7 +784,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_shareres,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St+1,
 		.pc_name = "UNSHARE",
 	},
@@ -794,7 +794,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
 		.pc_encode = nlmsvc_encode_res,
 		.pc_argsize = sizeof(struct lockd_args),
 		.pc_argzero = sizeof(struct lockd_args),
-		.pc_ressize = sizeof(struct nlm_res),
+		.pc_ressize = sizeof(struct lockd_res),
 		.pc_xdrressize = Ck+St,
 		.pc_name = "NM_LOCK",
 	},
@@ -815,7 +815,7 @@ static const struct svc_procedure nlmsvc_procedures[24] = {
  */
 union nlmsvc_xdrstore {
 	struct lockd_args		args;
-	struct nlm_res			res;
+	struct lockd_res		res;
 	struct nlm_reboot		reboot;
 };
 
diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 0130cdea5642..bcf65152a436 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -127,7 +127,7 @@ svcxdr_encode_holder(struct xdr_stream *xdr, const struct lockd_lock *lock)
 }
 
 static bool
-svcxdr_encode_testrply(struct xdr_stream *xdr, const struct nlm_res *resp)
+svcxdr_encode_testrply(struct xdr_stream *xdr, const struct lockd_res *resp)
 {
 	if (!svcxdr_encode_stats(xdr, resp->status))
 		return false;
@@ -231,7 +231,7 @@ nlmsvc_decode_unlockargs(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 bool
 nlmsvc_decode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 {
-	struct nlm_res *resp = rqstp->rq_argp;
+	struct lockd_res *resp = rqstp->rq_argp;
 
 	if (!svcxdr_decode_cookie(xdr, &resp->cookie))
 		return false;
@@ -322,7 +322,7 @@ nlmsvc_encode_void(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 bool
 nlmsvc_encode_testres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 {
-	struct nlm_res *resp = rqstp->rq_resp;
+	struct lockd_res *resp = rqstp->rq_resp;
 
 	return svcxdr_encode_cookie(xdr, &resp->cookie) &&
 		svcxdr_encode_testrply(xdr, resp);
@@ -331,7 +331,7 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 bool
 nlmsvc_encode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 {
-	struct nlm_res *resp = rqstp->rq_resp;
+	struct lockd_res *resp = rqstp->rq_resp;
 
 	return svcxdr_encode_cookie(xdr, &resp->cookie) &&
 		svcxdr_encode_stats(xdr, resp->status);
@@ -340,7 +340,7 @@ nlmsvc_encode_res(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 bool
 nlmsvc_encode_shareres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
 {
-	struct nlm_res *resp = rqstp->rq_resp;
+	struct lockd_res *resp = rqstp->rq_resp;
 
 	if (!svcxdr_encode_cookie(xdr, &resp->cookie))
 		return false;
diff --git a/fs/lockd/xdr.h b/fs/lockd/xdr.h
index ffdcad0f8680..a480df7cae31 100644
--- a/fs/lockd/xdr.h
+++ b/fs/lockd/xdr.h
@@ -71,7 +71,7 @@ struct lockd_args {
 /*
  * Generic lockd result
  */
-struct nlm_res {
+struct lockd_res {
 	struct lockd_cookie	cookie;
 	__be32			status;
 	struct lockd_lock	lock;