diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-01-08 09:48:15 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2013-02-01 10:13:47 -0500 |
| commit | 6a24dfb645dbcb05b34d08b991d082bdaa3ff072 (patch) | |
| tree | 4d99948bb2bcb1170778bc668dc4d64e327e8175 /net/sunrpc/xprt.c | |
| parent | 3dc0da278e2b26fa8e353b3a962b2c89e184d353 (diff) | |
| download | op-kernel-dev-6a24dfb645dbcb05b34d08b991d082bdaa3ff072.zip op-kernel-dev-6a24dfb645dbcb05b34d08b991d082bdaa3ff072.tar.gz | |
SUNRPC: Pass pointers to struct rpc_xprt to the congestion window
Avoid access to task->tk_xprt
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index 7740251..e1e439e 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -438,15 +438,15 @@ EXPORT_SYMBOL_GPL(xprt_release_rqst_cong); /** * xprt_adjust_cwnd - adjust transport congestion window + * @xprt: pointer to xprt * @task: recently completed RPC request used to adjust window * @result: result code of completed RPC request * * We use a time-smoothed congestion estimator to avoid heavy oscillation. */ -void xprt_adjust_cwnd(struct rpc_task *task, int result) +void xprt_adjust_cwnd(struct rpc_xprt *xprt, struct rpc_task *task, int result) { struct rpc_rqst *req = task->tk_rqstp; - struct rpc_xprt *xprt = task->tk_xprt; unsigned long cwnd = xprt->cwnd; if (result >= 0 && cwnd <= xprt->cong) { @@ -834,7 +834,7 @@ static void xprt_timer(struct rpc_task *task) spin_lock_bh(&xprt->transport_lock); if (!req->rq_reply_bytes_recvd) { if (xprt->ops->timer) - xprt->ops->timer(task); + xprt->ops->timer(xprt, task); } else task->tk_status = 0; spin_unlock_bh(&xprt->transport_lock); |
