[rds-commits] zab commits r118 - trunk/linux/net/rds

[svn-commits@oss.oracle.com]

Author: zab
Date: 2006-06-28 15:39:58 -0500 (Wed, 28 Jun 2006)
New Revision: 118

Modified:
   trunk/linux/net/rds/ib_cm.c
Log:
Set the connection request CM context pointer so that the connection
established event can get at the conn.


Modified: trunk/linux/net/rds/ib_cm.c
===================================================================
--- trunk/linux/net/rds/ib_cm.c	2006-06-28 18:44:52 UTC (rev 117)
+++ trunk/linux/net/rds/ib_cm.c	2006-06-28 20:39:58 UTC (rev 118)
@@ -192,14 +192,17 @@
 		ret = PTR_ERR(conn);
 		goto out;
 	}
+	ic = conn->c_transport_data;
 
 	/* XXX this notices the race */
 	if (test_and_set_bit(RDS_CONN_CONNECTING, &conn->c_status))
 		BUG();
 
-	/* XXX this seems totally crazy. */
-	ic = conn->c_transport_data;
+	BUG_ON(ic->i_cm_id);
+	BUG_ON(cm_id->context);
+
 	ic->i_cm_id = cm_id;
+	cm_id->context = conn;
 
 	ret = rds_ib_setup_qp(conn);
 	if (ret)