[openib-general] RE: [PATCH] rdma_cm oops: rdma_destroy_id

[Sean Hefty]

>Since we always start address resolution with rdma_resolve_ip, we should
>always cancel it with rdma_addr_cancel - we can't switch on device type
>since we don't yet know what device we will use.
>
>Signed-off-by: Michael S. Tsirkin <mst at mellanox.co.il>

Thanks - I committed this version of the patch which just tosses the
cma_cancel_addr routine.

- Sean

---

Index: cma.c
===================================================================
--- cma.c	(revision 5693)
+++ cma.c	(working copy)
@@ -551,17 +551,6 @@ static int cma_notify_user(struct rdma_i
 	return id_priv->id.event_handler(&id_priv->id, &event);
 }
 
-static void cma_cancel_addr(struct rdma_id_private *id_priv)
-{
-	switch (rdma_node_get_transport(id_priv->id.device->node_type)) {
-	case RDMA_TRANSPORT_IB:
-		rdma_addr_cancel(&id_priv->id.route.addr.dev_addr);
-		break;
-	default:
-		break;
-	}
-}
-
 static void cma_cancel_route(struct rdma_id_private *id_priv)
 {
 	switch (rdma_node_get_transport(id_priv->id.device->node_type)) {
@@ -623,7 +612,7 @@ static void cma_cancel_operation(struct 
 {
 	switch (state) {
 	case CMA_ADDR_QUERY:
-		cma_cancel_addr(id_priv);
+		rdma_addr_cancel(&id_priv->id.route.addr.dev_addr);
 		break;
 	case CMA_ROUTE_QUERY:
 		cma_cancel_route(id_priv);