commit

diff --git a/meta b/meta
index 28495aca1d94b1cef4d17f072adc7dd36afcda83..3e6d3240a13b5c9212c3dd8e953fc58017b13a42 100644 (file)
--- a/meta
+++ b/meta
@@ -1,8 +1,7 @@
 Version: 1
-Previous: 7fc2b18c5690127d5f972c5cff6fe5f79cd9b4d2
+Previous: 2d2acee7509c720caf74f9be1f53d41873aa353d
 Head: 8a92d0c3c8ce5f513dff974912143f6b0283f8e3
 Applied:
-  ucmatose: 714af39b2bc2cc54dd2391a0df2c7e54856bc9c7
   ucmatose-accept: 8a92d0c3c8ce5f513dff974912143f6b0283f8e3
 Unapplied:
   af-ib-conn: 70cdbcec6986d1fcc8146a73cf2d8b6a537e71f5

diff --git a/patches/ucmatose b/patches/ucmatose
deleted file mode 100644 (file)
index e7ee345..0000000
--- a/patches/ucmatose
+++ /dev/null
@@ -1,51 +0,0 @@
-Bottom: 1822cd2c7677964465623928562d078bde142d96
-Top:    f7d2ba0428817eeaa855ddb332d7f7e51db9326f
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2012-10-04 11:49:59 -0700
-
-ucmatose: Fix number of connections to disconnect
-
-When ucmatose aborts because of issues trying to connect
-to the server, it moves to disconnecting all connections.
-However, not all connections may have been established.
-The result is that ucmatose will hang in disconnect_events.
-Fix this by setting the number of times that we need to
-disconnect to the number of times that we successfully
-connect.
-
-This problem is based on a report by Doug Ledford
-<dledford@redhat.com>
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
----
-
-diff --git a/examples/cmatose.c b/examples/cmatose.c
-index 94fc4cd..9ea6777 100644
---- a/examples/cmatose.c
-+++ b/examples/cmatose.c
-@@ -211,7 +211,6 @@ static int post_sends(struct cmatest_node *node)
- 
- static void connect_error(void)
- {
--      test.disconnects_left--;
-       test.connects_left--;
- }
- 
-@@ -323,6 +322,7 @@ static int cma_handler(struct rdma_cm_id *cma_id, struct rdma_cm_event *event)
-       case RDMA_CM_EVENT_ESTABLISHED:
-               ((struct cmatest_node *) cma_id->context)->connected = 1;
-               test.connects_left--;
-+              test.disconnects_left++;
-               break;
-       case RDMA_CM_EVENT_ADDR_ERROR:
-       case RDMA_CM_EVENT_ROUTE_ERROR:
-@@ -688,7 +688,6 @@ int main(int argc, char **argv)
-       }
- 
-       test.connects_left = connections;
--      test.disconnects_left = connections;
- 
-       test.channel = rdma_create_event_channel();
-       if (!test.channel) {