[openib-general] [PATCH] kdapl CM: Fix some double deletions in error paths on active side

[Hal Rosenstock]

kdapl CM: Fix some double deletions in error paths on active side
Also, minor change to error message

Signed-off-by: Hal Rosenstock <halr at voltaire.com>


Index: dapl_openib_cm.c
===================================================================
-- dapl_openib_cm.c	(revision 2309)
+++ dapl_openib_cm.c	(working copy)
@@ -283,7 +283,7 @@
 
 	if (rec_num <= 0) {
 		printk(KERN_ERR "dapl_path_comp_handler: path resolution "
-		       "failed (%d) retries %d!!!\n", rec_num, conn->retries);
+		       "failed %d retry %d!!!\n", rec_num, conn->retries);
 		if (++conn->retries > OPENIB_MAX_AT_RETRY) {
 			printk(KERN_ERR "dapl_path_comp_handler: ep_ptr 0x%p\n",
 			       conn->ep);
@@ -322,9 +322,7 @@
 	return;
 
 error:
-	//*** should we pass conn here?  it will be destroyed...
 	dapl_evd_connection_callback(conn, event, NULL, conn->ep);
-	dapl_destroy_cm_id(conn);
 }
 
 static void dapl_rt_comp_handler(u64 req_id, void *context, int rec_num)
@@ -334,7 +332,7 @@
 	ib_cm_events_t event;
 
 	if (rec_num <= 0) {
-		printk(KERN_ERR "dapl_rt_comp_handler: rec_num %d retry %d\n",
+		printk(KERN_ERR "dapl_rt_comp_handler: rec num %d retry %d\n",
 		       rec_num, conn->retries);
 		if (++conn->retries > OPENIB_MAX_AT_RETRY) {
 			event = IB_CME_DESTINATION_UNREACHABLE;
@@ -371,9 +369,7 @@
 	return;
 
 error:
-	//*** should we pass conn here?  it will be destroyed...
 	dapl_evd_connection_callback(conn, event, NULL, conn->ep);
-	dapl_destroy_cm_id(conn);
 }
 
 /*