diff options
| author | Ingo Molnar <mingo@kernel.org> | 2018-05-15 08:10:50 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2018-05-15 08:10:50 +0200 |
| commit | 371b3269082500fc418043742467119ab0d224c6 (patch) | |
| tree | 02f0e932e356adef8c34420be9a3d0fd5283e803 /net/sunrpc/xprtrdma/verbs.c | |
| parent | 8cc05c71ba5f793690bb72aeb404dce65b5d4b52 (diff) | |
| parent | 67b8d5c7081221efa252e111cd52532ec6d4266f (diff) | |
Merge tag 'v4.17-rc5' into locking/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'net/sunrpc/xprtrdma/verbs.c')
| -rw-r--r-- | net/sunrpc/xprtrdma/verbs.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/net/sunrpc/xprtrdma/verbs.c b/net/sunrpc/xprtrdma/verbs.c index fe5eaca2d197..c345d365af88 100644 --- a/net/sunrpc/xprtrdma/verbs.c +++ b/net/sunrpc/xprtrdma/verbs.c @@ -1254,6 +1254,11 @@ rpcrdma_mrs_destroy(struct rpcrdma_buffer *buf) list_del(&mr->mr_all); spin_unlock(&buf->rb_mrlock); + + /* Ensure MW is not on any rl_registered list */ + if (!list_empty(&mr->mr_list)) + list_del(&mr->mr_list); + ia->ri_ops->ro_release_mr(mr); count++; spin_lock(&buf->rb_mrlock); |