Revert "sunrpc: don't change ->sv_stats if it doesn't exist"
This reverts commit e4c6a8a3a1
.
This commit is contained in:
parent
ac304417cc
commit
f2f218a130
1 changed files with 8 additions and 16 deletions
|
@ -1355,8 +1355,7 @@ svc_process_common(struct svc_rqst *rqstp, struct kvec *argv, struct kvec *resv)
|
|||
goto err_bad_proc;
|
||||
|
||||
/* Syntactic check complete */
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpccnt++;
|
||||
serv->sv_stats->rpccnt++;
|
||||
trace_svc_process(rqstp, progp->pg_name);
|
||||
|
||||
/* Build the reply header. */
|
||||
|
@ -1422,8 +1421,7 @@ err_short_len:
|
|||
goto close_xprt;
|
||||
|
||||
err_bad_rpc:
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
svc_putnl(resv, 1); /* REJECT */
|
||||
svc_putnl(resv, 0); /* RPC_MISMATCH */
|
||||
svc_putnl(resv, 2); /* Only RPCv2 supported */
|
||||
|
@ -1436,8 +1434,7 @@ err_release_bad_auth:
|
|||
err_bad_auth:
|
||||
dprintk("svc: authentication failed (%d)\n",
|
||||
be32_to_cpu(rqstp->rq_auth_stat));
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadauth++;
|
||||
serv->sv_stats->rpcbadauth++;
|
||||
/* Restore write pointer to location of accept status: */
|
||||
xdr_ressize_check(rqstp, reply_statp);
|
||||
svc_putnl(resv, 1); /* REJECT */
|
||||
|
@ -1447,8 +1444,7 @@ err_bad_auth:
|
|||
|
||||
err_bad_prog:
|
||||
dprintk("svc: unknown program %d\n", prog);
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
svc_putnl(resv, RPC_PROG_UNAVAIL);
|
||||
goto sendit;
|
||||
|
||||
|
@ -1456,8 +1452,7 @@ err_bad_vers:
|
|||
svc_printk(rqstp, "unknown version (%d for prog %d, %s)\n",
|
||||
rqstp->rq_vers, rqstp->rq_prog, progp->pg_name);
|
||||
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
svc_putnl(resv, RPC_PROG_MISMATCH);
|
||||
svc_putnl(resv, process.mismatch.lovers);
|
||||
svc_putnl(resv, process.mismatch.hivers);
|
||||
|
@ -1466,8 +1461,7 @@ err_bad_vers:
|
|||
err_bad_proc:
|
||||
svc_printk(rqstp, "unknown procedure (%d)\n", rqstp->rq_proc);
|
||||
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
svc_putnl(resv, RPC_PROC_UNAVAIL);
|
||||
goto sendit;
|
||||
|
||||
|
@ -1476,8 +1470,7 @@ err_garbage:
|
|||
|
||||
rpc_stat = rpc_garbage_args;
|
||||
err_bad:
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
svc_putnl(resv, ntohl(rpc_stat));
|
||||
goto sendit;
|
||||
}
|
||||
|
@ -1512,8 +1505,7 @@ svc_process(struct svc_rqst *rqstp)
|
|||
if (dir != 0) {
|
||||
/* direction != CALL */
|
||||
svc_printk(rqstp, "bad direction %d, dropping request\n", dir);
|
||||
if (serv->sv_stats)
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
serv->sv_stats->rpcbadfmt++;
|
||||
goto out_drop;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue