diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-09 20:14:20 +0200 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-09-09 20:14:20 +0200 |
| commit | ab29a807a7ddaa7c84d2f4cb8d29e74e33759072 (patch) | |
| tree | 695ea913ee924782d1dc92b5aa9bd5aa09a15087 /net/sunrpc/xprtrdma | |
| parent | Merge tag 'linux-kselftest-5.9-rc5' of git://git.kernel.org/pub/scm/linux/ker... (diff) | |
| parent | SUNRPC: stop printk reading past end of string (diff) | |
| download | linux-ab29a807a7ddaa7c84d2f4cb8d29e74e33759072.tar.xz linux-ab29a807a7ddaa7c84d2f4cb8d29e74e33759072.zip | |
Merge tag 'nfs-for-5.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs
Pull NFS client bugfixes from Trond Myklebust:
- Fix an NFS/RDMA resource leak
- Fix the error handling during delegation recall
- NFSv4.0 needs to return the delegation on a zero-stateid SETATTR
- Stop printk reading past end of string
* tag 'nfs-for-5.9-2' of git://git.linux-nfs.org/projects/trondmy/linux-nfs:
SUNRPC: stop printk reading past end of string
NFS: Zero-stateid SETATTR should first return delegation
NFSv4.1 handle ERR_DELAY error reclaiming locking state on delegation recall
xprtrdma: Release in-flight MRs on disconnect
Diffstat (limited to 'net/sunrpc/xprtrdma')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index 3f86d039875c..ad6e2e4994ce 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -933,6 +933,8 @@ static void rpcrdma_req_reset(struct rpcrdma_req *req) rpcrdma_regbuf_dma_unmap(req->rl_sendbuf); rpcrdma_regbuf_dma_unmap(req->rl_recvbuf); + + frwr_reset(req); } /* ASSUMPTION: the rb_allreqs list is stable for the duration, |