Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8f8e05c5 authored by J.Bruce Fields's avatar J.Bruce Fields Committed by Linus Torvalds
Browse files

[PATCH] knfsd: svcrpc: use consistent variable name for the reply state 



The rpc reply has multiple levels of error returns.  The code here contributes
to the confusion by using "accept_statp" for a pointer to what the rfc (and
wireshark, etc.) refer to as the "reply_stat".  (The confusion is compounded
by the fact that the rfc also has an "accept_stat" which follows the
reply_stat in the succesful case.)

Signed-off-by: default avatarJ. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5b304bc5

net/sunrpc/svc.c

+3 −3
Original line number Diff line number Diff line
@@ -699,7 +699,7 @@ svc_process(struct svc_rqst *rqstp) 
	u32			dir, prog, vers, proc;

	__be32			auth_stat, rpc_stat;

	int			auth_res;

	__be32			*accept_statp;

	__be32			*reply_statp;



	rpc_stat = rpc_success;
@@ -740,7 +740,7 @@ svc_process(struct svc_rqst *rqstp) 
		goto err_bad_rpc;



	/* Save position in case we later decide to reject: */

	accept_statp = resv->iov_base + resv->iov_len;

	reply_statp = resv->iov_base + resv->iov_len;



	svc_putnl(resv, 0);		/* ACCEPT */
@@ -888,7 +888,7 @@ err_bad_auth: 
	dprintk("svc: authentication failed (%d)\n", ntohl(auth_stat));

	serv->sv_stats->rpcbadauth++;

	/* Restore write pointer to location of accept status: */

	xdr_ressize_check(rqstp, accept_statp);

	xdr_ressize_check(rqstp, reply_statp);

	svc_putnl(resv, 1);	/* REJECT */

	svc_putnl(resv, 1);	/* AUTH_ERROR */

	svc_putnl(resv, ntohl(auth_stat));	/* status */