Commit cee4db19 authored by Chuck Lever's avatar Chuck Lever
Browse files

SUNRPC: Refactor RPC server dispatch method 



Currently, svcauth_gss_accept() pre-reserves response buffer space
for the RPC payload length and GSS sequence number before returning
to the dispatcher, which then adds the header's accept_stat field.

The problem is the accept_stat field is supposed to go before the
length and seq_num fields. So svcauth_gss_release() has to relocate
the accept_stat value (see svcauth_gss_prepare_to_wrap()).

To enable these fields to be added to the response buffer in the
correct (final) order, the pointer to the accept_stat has to be made
available to svcauth_gss_accept() so that it can set it before
reserving space for the length and seq_num fields.

As a first step, move the pointer to the location of the accept_stat
field into struct svc_rqst.

Reviewed-by: default avatarJeff Layton <jlayton@kernel.org>
Signed-off-by: default avatarChuck Lever <chuck.lever@oracle.com>
parent 5df25676

fs/lockd/svc.c

+2 −2
Original line number Diff line number Diff line
@@ -685,15 +685,15 @@ module_exit(exit_nlm); 
/**

 * nlmsvc_dispatch - Process an NLM Request

 * @rqstp: incoming request

 * @statp: pointer to location of accept_stat field in RPC Reply buffer

 *

 * Return values:

 *  %0: Processing complete; do not send a Reply

 *  %1: Processing complete; send Reply in rqstp->rq_res

 */

static int nlmsvc_dispatch(struct svc_rqst *rqstp, __be32 *statp)

static int nlmsvc_dispatch(struct svc_rqst *rqstp)

{

	const struct svc_procedure *procp = rqstp->rq_procinfo;

	__be32 *statp = rqstp->rq_accept_statp;



	if (!procp->pc_decode(rqstp, &rqstp->rq_arg_stream))

		goto out_decode_err;

fs/nfs/callback_xdr.c

+2 −2
Original line number Diff line number Diff line
@@ -980,11 +980,11 @@ static __be32 nfs4_callback_compound(struct svc_rqst *rqstp) 
}



static int

nfs_callback_dispatch(struct svc_rqst *rqstp, __be32 *statp)

nfs_callback_dispatch(struct svc_rqst *rqstp)

{

	const struct svc_procedure *procp = rqstp->rq_procinfo;



	*statp = procp->pc_func(rqstp);

	*rqstp->rq_accept_statp = procp->pc_func(rqstp);

	return 1;

}

fs/nfsd/nfscache.c

+1 −1
Original line number Diff line number Diff line
@@ -509,7 +509,7 @@ int nfsd_cache_lookup(struct svc_rqst *rqstp) 
 * nfsd_cache_update - Update an entry in the duplicate reply cache.

 * @rqstp: svc_rqst with a finished Reply

 * @cachetype: which cache to update

 * @statp: Reply's status code

 * @statp: pointer to Reply's NFS status code, or NULL

 *

 * This is called from nfsd_dispatch when the procedure has been

 * executed and the complete reply is in rqstp->rq_res.

fs/nfsd/nfsd.h

+1 −1
Original line number Diff line number Diff line
@@ -86,7 +86,7 @@ bool nfssvc_encode_voidres(struct svc_rqst *rqstp, 
 * Function prototypes.

 */

int		nfsd_svc(int nrservs, struct net *net, const struct cred *cred);

int		nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp);

int		nfsd_dispatch(struct svc_rqst *rqstp);



int		nfsd_nrthreads(struct net *);

int		nfsd_nrpools(struct net *);

fs/nfsd/nfssvc.c

+2 −2
Original line number Diff line number Diff line
@@ -1022,7 +1022,6 @@ nfsd(void *vrqstp) 
/**

 * nfsd_dispatch - Process an NFS or NFSACL Request

 * @rqstp: incoming request

 * @statp: pointer to location of accept_stat field in RPC Reply buffer

 *

 * This RPC dispatcher integrates the NFS server's duplicate reply cache.

 *
@@ -1030,9 +1029,10 @@ nfsd(void *vrqstp) 
 *  %0: Processing complete; do not send a Reply

 *  %1: Processing complete; send Reply in rqstp->rq_res

 */

int nfsd_dispatch(struct svc_rqst *rqstp, __be32 *statp)

int nfsd_dispatch(struct svc_rqst *rqstp)

{

	const struct svc_procedure *proc = rqstp->rq_procinfo;

	__be32 *statp = rqstp->rq_accept_statp;



	/*

	 * Give the xdr decoder a chance to change this if it wants