leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SUNRPC: Clear the request rq_bytes_sent field in xprt_release_write

Browse Source 
Otherwise the tests of req->rq_bytes_sent in xprt_prepare_transmit
will fail if we're dealing with a resend.

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
This commit is contained in:
Trond Myklebust 2013-09-27 11:09:53 -04:00
parent 0a66052130
commit ee071eff0f
1 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
net/sunrpc/xprt.c
View File

@ -358,6 +358,11 @@ out_unlock:
void xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task) void xprt_release_xprt(struct rpc_xprt *xprt, struct rpc_task *task)
{ {
if (xprt->snd_task == task) { if (xprt->snd_task == task) {
if (task != NULL) {
struct rpc_rqst *req = task->tk_rqstp;
if (req != NULL)
req->rq_bytes_sent = 0;
}
xprt_clear_locked(xprt); xprt_clear_locked(xprt);
__xprt_lock_write_next(xprt); __xprt_lock_write_next(xprt);
} }
@ -375,6 +380,11 @@ EXPORT_SYMBOL_GPL(xprt_release_xprt);
void xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task) void xprt_release_xprt_cong(struct rpc_xprt *xprt, struct rpc_task *task)
{ {
if (xprt->snd_task == task) { if (xprt->snd_task == task) {
if (task != NULL) {
struct rpc_rqst *req = task->tk_rqstp;
if (req != NULL)
req->rq_bytes_sent = 0;
}
xprt_clear_locked(xprt); xprt_clear_locked(xprt);
__xprt_lock_write_next_cong(xprt); __xprt_lock_write_next_cong(xprt);
} }