RDS: Don't destroy the rdma id until after we're done using it

During connection resets, we are destroying the rdma id too soon. We can't
destroy it when it is still in use. So lets move rdma_destroy_id() after
we clear the rings.

Reviewed-by: Ajaykumar Hotchandani <ajaykumar.hotchandani@oracle.com>
Signed-off-by: Santosh Shilimkar <ssantosh@kernel.org>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@oracle.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Santosh Shilimkar 2015-08-22 15:45:32 -07:00 committed by David S. Miller
parent 5c240fa2ab
commit 1c3be624f4
1 changed files with 2 additions and 1 deletions

View File

@ -647,7 +647,6 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
ib_destroy_cq(ic->i_send_cq); ib_destroy_cq(ic->i_send_cq);
if (ic->i_recv_cq) if (ic->i_recv_cq)
ib_destroy_cq(ic->i_recv_cq); ib_destroy_cq(ic->i_recv_cq);
rdma_destroy_id(ic->i_cm_id);
/* then free the resources that ib callbacks use */ /* then free the resources that ib callbacks use */
if (ic->i_send_hdrs) if (ic->i_send_hdrs)
@ -673,6 +672,8 @@ void rds_ib_conn_shutdown(struct rds_connection *conn)
if (ic->i_recvs) if (ic->i_recvs)
rds_ib_recv_clear_ring(ic); rds_ib_recv_clear_ring(ic);
rdma_destroy_id(ic->i_cm_id);
/* /*
* Move connection back to the nodev list. * Move connection back to the nodev list.
*/ */