diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-13 12:46:04 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2015-12-13 12:46:04 -0800 |
| commit | fc89182834dbe84c7b876d8dbe4b8ee94b6fe22c (patch) | |
| tree | e76a38b1088f639fa080bc3151a86425eab1c281 /net/sunrpc/backchannel_rqst.c | |
| parent | dec9cbf97df4a0d03307326a849dd7b4d27a78aa (diff) | |
| parent | 756b9b37cfb2e3dc76b2e43a8c097402ac736e07 (diff) | |
| download | op-kernel-dev-fc89182834dbe84c7b876d8dbe4b8ee94b6fe22c.zip op-kernel-dev-fc89182834dbe84c7b876d8dbe4b8ee94b6fe22c.tar.gz | |
Merge tag 'nfs-for-4.4-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfix from Trond Myklebust:
"SUNRPC: Fix a NFSv4.1 callback channel regression"
* tag 'nfs-for-4.4-3' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
SUNRPC: Fix callback channel
Diffstat (limited to 'net/sunrpc/backchannel_rqst.c')
| -rw-r--r-- | net/sunrpc/backchannel_rqst.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/net/sunrpc/backchannel_rqst.c b/net/sunrpc/backchannel_rqst.c index 95f82d8..229956b 100644 --- a/net/sunrpc/backchannel_rqst.c +++ b/net/sunrpc/backchannel_rqst.c @@ -353,20 +353,12 @@ void xprt_complete_bc_request(struct rpc_rqst *req, uint32_t copied) { struct rpc_xprt *xprt = req->rq_xprt; struct svc_serv *bc_serv = xprt->bc_serv; - struct xdr_buf *rq_rcv_buf = &req->rq_rcv_buf; spin_lock(&xprt->bc_pa_lock); list_del(&req->rq_bc_pa_list); xprt_dec_alloc_count(xprt, 1); spin_unlock(&xprt->bc_pa_lock); - if (copied <= rq_rcv_buf->head[0].iov_len) { - rq_rcv_buf->head[0].iov_len = copied; - rq_rcv_buf->page_len = 0; - } else { - rq_rcv_buf->page_len = copied - rq_rcv_buf->head[0].iov_len; - } - req->rq_private_buf.len = copied; set_bit(RPC_BC_PA_IN_USE, &req->rq_bc_pa_state); |
