refresh

diff --git a/meta b/meta
index 1eb8b13926cdcab0c1a608c262b3ff5f0233c68d..6bddec5fe9248115624779018dc1253f7939706e 100644 (file)
--- a/meta
+++ b/meta
@@ -1,10 +1,9 @@
 Version: 1
-Previous: 4207925ea51557b39960046c4d6ada24c13758d9
-Head: 71478366fdb68d8a30c77d83fb99908335909c67
+Previous: f0a1491ac9c0cc7404105f42852a9ce243fa4c9f
+Head: f6ef52ad6c76808fc8907155c51d9a9b34b13a40
 Applied:
   libibverbs-delete-channel: 1a2e03aa93780e8767fd6e0292edb623a39a56eb
-  dapl-close: 123f3ff273b5e819457a737543bf288c31b51168
-  refresh-temp: 71478366fdb68d8a30c77d83fb99908335909c67
+  dapl-close: f6ef52ad6c76808fc8907155c51d9a9b34b13a40
 Unapplied:
   rm-build: c6f066675d61b6b6ad5b6271e8af655439f70dc6
   test-wv-print: e22c09acef52e5c119f80c0a646bcf9035094b80

diff --git a/patches/dapl-close b/patches/dapl-close
index 8404bccc4d3f21a136fe9c4fd291a79ca9d3522d..3db4ee8fdbf353a62cebe6e6e5a6e19782faa2ff 100644 (file)
--- a/patches/dapl-close
+++ b/patches/dapl-close
@@ -1,5 +1,5 @@
 Bottom: 977977969443cd216ed0ca116e8cbd8debb6e5d3
-Top:    977977969443cd216ed0ca116e8cbd8debb6e5d3
+Top:    162e3aa3a1e765055f019ee04fd1621434f5b1fd
 Author: Sean Hefty <sean.hefty@intel.com>
 Date:   2010-01-22 14:48:54 -0800
 
@@ -14,4 +14,67 @@ Signed-off-by: Sean Hefty <sean.hefty@intel.com>
 
 ---
 
-
+diff --git a/trunk/ulp/dapl2/dapl/openib_cma/device.c b/trunk/ulp/dapl2/dapl/openib_cma/device.c
+index e9ec733..7ab05aa 100644
+--- a/trunk/ulp/dapl2/dapl/openib_cma/device.c
++++ b/trunk/ulp/dapl2/dapl/openib_cma/device.c
+@@ -474,12 +474,6 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
+       dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p->%p\n",
+                    hca_ptr, hca_ptr->ib_hca_handle);
+ 
+-      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
+-              if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))
+-                      return (dapl_convert_errno(errno, "ib_close_device"));
+-              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
+-      }
+-
+       dapl_os_lock(&g_hca_lock);
+       if (g_ib_thread_state != IB_THREAD_RUN) {
+               dapl_os_unlock(&g_hca_lock);
+@@ -508,6 +502,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
+               dapl_os_sleep_usec(1000);
+       }
+ bail:
++      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
++              if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))
++                      return (dapl_convert_errno(errno, "ib_close_device"));
++              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
++      }
++
+       return (DAT_SUCCESS);
+ }
+ 
+diff --git a/trunk/ulp/dapl2/dapl/openib_scm/device.c b/trunk/ulp/dapl2/dapl/openib_scm/device.c
+index dedcb16..35d4c45 100644
+--- a/trunk/ulp/dapl2/dapl/openib_scm/device.c
++++ b/trunk/ulp/dapl2/dapl/openib_scm/device.c
+@@ -465,16 +465,10 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
+ {
+       dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p\n", hca_ptr);
+ 
+-      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
+-              if (ibv_close_device(hca_ptr->ib_hca_handle))
+-                      return (dapl_convert_errno(errno, "ib_close_device"));
+-              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
+-      }
+-
+       dapl_os_lock(&g_hca_lock);
+       if (g_ib_thread_state != IB_THREAD_RUN) {
+               dapl_os_unlock(&g_hca_lock);
+-              return (DAT_SUCCESS);
++              goto out;
+       }
+       dapl_os_unlock(&g_hca_lock);
+ 
+@@ -509,6 +503,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
+               dapl_os_sleep_usec(1000);
+       }
+ 
++out:
++      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
++              if (ibv_close_device(hca_ptr->ib_hca_handle))
++                      return (dapl_convert_errno(errno, "ib_close_device"));
++              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
++      }
+       return (DAT_SUCCESS);
+ }

diff --git a/patches/refresh-temp b/patches/refresh-temp
deleted file mode 100644 (file)
index 0f2b4a6..0000000
--- a/patches/refresh-temp
+++ /dev/null
@@ -1,73 +0,0 @@
-Bottom: 977977969443cd216ed0ca116e8cbd8debb6e5d3
-Top:    162e3aa3a1e765055f019ee04fd1621434f5b1fd
-Author: Sean Hefty <sean.hefty@intel.com>
-Date:   2010-01-22 14:52:45 -0800
-
-Refresh of dapl-close
-
----
-
-diff --git a/trunk/ulp/dapl2/dapl/openib_cma/device.c b/trunk/ulp/dapl2/dapl/openib_cma/device.c
-index e9ec733..7ab05aa 100644
---- a/trunk/ulp/dapl2/dapl/openib_cma/device.c
-+++ b/trunk/ulp/dapl2/dapl/openib_cma/device.c
-@@ -474,12 +474,6 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
-       dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p->%p\n",
-                    hca_ptr, hca_ptr->ib_hca_handle);
- 
--      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
--              if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))
--                      return (dapl_convert_errno(errno, "ib_close_device"));
--              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
--      }
--
-       dapl_os_lock(&g_hca_lock);
-       if (g_ib_thread_state != IB_THREAD_RUN) {
-               dapl_os_unlock(&g_hca_lock);
-@@ -508,6 +502,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
-               dapl_os_sleep_usec(1000);
-       }
- bail:
-+      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
-+              if (rdma_destroy_id(hca_ptr->ib_trans.cm_id))
-+                      return (dapl_convert_errno(errno, "ib_close_device"));
-+              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
-+      }
-+
-       return (DAT_SUCCESS);
- }
- 
-diff --git a/trunk/ulp/dapl2/dapl/openib_scm/device.c b/trunk/ulp/dapl2/dapl/openib_scm/device.c
-index dedcb16..35d4c45 100644
---- a/trunk/ulp/dapl2/dapl/openib_scm/device.c
-+++ b/trunk/ulp/dapl2/dapl/openib_scm/device.c
-@@ -465,16 +465,10 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
- {
-       dapl_dbg_log(DAPL_DBG_TYPE_UTIL, " close_hca: %p\n", hca_ptr);
- 
--      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
--              if (ibv_close_device(hca_ptr->ib_hca_handle))
--                      return (dapl_convert_errno(errno, "ib_close_device"));
--              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
--      }
--
-       dapl_os_lock(&g_hca_lock);
-       if (g_ib_thread_state != IB_THREAD_RUN) {
-               dapl_os_unlock(&g_hca_lock);
--              return (DAT_SUCCESS);
-+              goto out;
-       }
-       dapl_os_unlock(&g_hca_lock);
- 
-@@ -509,6 +503,12 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr)
-               dapl_os_sleep_usec(1000);
-       }
- 
-+out:
-+      if (hca_ptr->ib_hca_handle != IB_INVALID_HANDLE) {
-+              if (ibv_close_device(hca_ptr->ib_hca_handle))
-+                      return (dapl_convert_errno(errno, "ib_close_device"));
-+              hca_ptr->ib_hca_handle = IB_INVALID_HANDLE;
-+      }
-       return (DAT_SUCCESS);
- }