|
@@ -110,6 +110,7 @@ frwr_op_init_mr(struct rpcrdma_ia *ia, struct rpcrdma_mr *mr)
|
|
if (!mr->mr_sg)
|
|
if (!mr->mr_sg)
|
|
goto out_list_err;
|
|
goto out_list_err;
|
|
|
|
|
|
|
|
+ INIT_LIST_HEAD(&mr->mr_list);
|
|
sg_init_table(mr->mr_sg, depth);
|
|
sg_init_table(mr->mr_sg, depth);
|
|
init_completion(&frwr->fr_linv_done);
|
|
init_completion(&frwr->fr_linv_done);
|
|
return 0;
|
|
return 0;
|
|
@@ -133,10 +134,6 @@ frwr_op_release_mr(struct rpcrdma_mr *mr)
|
|
{
|
|
{
|
|
int rc;
|
|
int rc;
|
|
|
|
|
|
- /* Ensure MR is not on any rl_registered list */
|
|
|
|
- if (!list_empty(&mr->mr_list))
|
|
|
|
- list_del(&mr->mr_list);
|
|
|
|
-
|
|
|
|
rc = ib_dereg_mr(mr->frwr.fr_mr);
|
|
rc = ib_dereg_mr(mr->frwr.fr_mr);
|
|
if (rc)
|
|
if (rc)
|
|
pr_err("rpcrdma: final ib_dereg_mr for %p returned %i\n",
|
|
pr_err("rpcrdma: final ib_dereg_mr for %p returned %i\n",
|
|
@@ -195,7 +192,7 @@ frwr_op_recover_mr(struct rpcrdma_mr *mr)
|
|
return;
|
|
return;
|
|
|
|
|
|
out_release:
|
|
out_release:
|
|
- pr_err("rpcrdma: FRWR reset failed %d, %p release\n", rc, mr);
|
|
|
|
|
|
+ pr_err("rpcrdma: FRWR reset failed %d, %p released\n", rc, mr);
|
|
r_xprt->rx_stats.mrs_orphaned++;
|
|
r_xprt->rx_stats.mrs_orphaned++;
|
|
|
|
|
|
spin_lock(&r_xprt->rx_buf.rb_mrlock);
|
|
spin_lock(&r_xprt->rx_buf.rb_mrlock);
|
|
@@ -476,7 +473,7 @@ frwr_op_reminv(struct rpcrdma_rep *rep, struct list_head *mrs)
|
|
|
|
|
|
list_for_each_entry(mr, mrs, mr_list)
|
|
list_for_each_entry(mr, mrs, mr_list)
|
|
if (mr->mr_handle == rep->rr_inv_rkey) {
|
|
if (mr->mr_handle == rep->rr_inv_rkey) {
|
|
- list_del(&mr->mr_list);
|
|
|
|
|
|
+ list_del_init(&mr->mr_list);
|
|
trace_xprtrdma_remoteinv(mr);
|
|
trace_xprtrdma_remoteinv(mr);
|
|
mr->frwr.fr_state = FRWR_IS_INVALID;
|
|
mr->frwr.fr_state = FRWR_IS_INVALID;
|
|
rpcrdma_mr_unmap_and_put(mr);
|
|
rpcrdma_mr_unmap_and_put(mr);
|