diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index daf3524040d6..4fb6090bc915 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -348,6 +348,16 @@ nlmsvc_encode_testres(struct svc_rqst *rqstp, __be32 *p)
 		svcxdr_encode_testrply(xdr, resp);
 }
 
+int
+nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
+{
+	struct xdr_stream *xdr = &rqstp->rq_res_stream;
+	struct nlm_res *resp = rqstp->rq_resp;
+
+	return svcxdr_encode_cookie(xdr, &resp->cookie) &&
+		svcxdr_encode_stats(xdr, resp->status);
+}
+
 int
 nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
 {
@@ -359,14 +369,3 @@ nlmsvc_encode_shareres(struct svc_rqst *rqstp, __be32 *p)
 	*p++ = xdr_zero;		/* sequence argument */
 	return xdr_ressize_check(rqstp, p);
 }
-
-int
-nlmsvc_encode_res(struct svc_rqst *rqstp, __be32 *p)
-{
-	struct nlm_res *resp = rqstp->rq_resp;
-
-	if (!(p = nlm_encode_cookie(p, &resp->cookie)))
-		return 0;
-	*p++ = resp->status;
-	return xdr_ressize_check(rqstp, p);
-}