diff options
| author | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
|---|---|---|
| committer | Wolfram Sang <wsa@kernel.org> | 2022-09-27 21:33:37 +0200 |
| commit | 85f17d677f6c40069287617630f202eb20fcfe36 (patch) | |
| tree | a0a7de12ddf19068b14124d7a64d79cf697e0710 /net/sunrpc/xprt.c | |
| parent | 2dec3a7a7beb23ec11b23986e0e331913d621ff1 (diff) | |
| parent | f76349cf41451c5c42a99f18a9163377e4b364ff (diff) | |
| download | linux-next-85f17d677f6c40069287617630f202eb20fcfe36.tar.gz | |
Merge branch 'master' into i2c/for-mergewindow
Diffstat (limited to 'net/sunrpc/xprt.c')
| -rw-r--r-- | net/sunrpc/xprt.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/net/sunrpc/xprt.c b/net/sunrpc/xprt.c index d71eec494826..f8fae7815649 100644 --- a/net/sunrpc/xprt.c +++ b/net/sunrpc/xprt.c @@ -1179,11 +1179,8 @@ xprt_request_dequeue_receive_locked(struct rpc_task *task) { struct rpc_rqst *req = task->tk_rqstp; - if (test_and_clear_bit(RPC_TASK_NEED_RECV, &task->tk_runstate)) { + if (test_and_clear_bit(RPC_TASK_NEED_RECV, &task->tk_runstate)) xprt_request_rb_remove(req->rq_xprt, req); - xdr_free_bvec(&req->rq_rcv_buf); - req->rq_private_buf.bvec = NULL; - } } /** @@ -1221,6 +1218,8 @@ void xprt_complete_rqst(struct rpc_task *task, int copied) xprt->stat.recvs++; + xdr_free_bvec(&req->rq_rcv_buf); + req->rq_private_buf.bvec = NULL; req->rq_private_buf.len = copied; /* Ensure all writes are done before we update */ /* req->rq_reply_bytes_recvd */ @@ -1453,6 +1452,7 @@ xprt_request_dequeue_xprt(struct rpc_task *task) xprt_request_dequeue_transmit_locked(task); xprt_request_dequeue_receive_locked(task); spin_unlock(&xprt->queue_lock); + xdr_free_bvec(&req->rq_rcv_buf); } } |