Skip to content

Commit

Permalink
[PATCH] knfsd: svcrpc: use consistent variable name for the reply state
Browse files Browse the repository at this point in the history
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: J. Bruce Fields <bfields@citi.umich.edu>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
  • Loading branch information
J.Bruce Fields authored and Linus Torvalds committed Oct 4, 2006
1 parent 5b304bc commit 8f8e05c
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions net/sunrpc/svc.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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 */

Expand Down Expand Up @@ -888,7 +888,7 @@ svc_process(struct svc_rqst *rqstp)
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 */
Expand Down

0 comments on commit 8f8e05c

Please sign in to comment.