delete

diff --git a/meta b/meta
index 97d8fb0960166e155027833b8566877a91913992..5784344acd29da49ec91c7bbe48ab3ba3f901673 100644 (file)
--- a/meta
+++ b/meta
@@ -1,5 +1,5 @@
 Version: 1
-Previous: 6b21655f968001087b3b0edca0108edba58f3af8
+Previous: 279633c6e5aaf9ee27d41efdb1766a9d02af191c
 Head: 99d79f7434308c2dc1891970e4da30149643cec5
 Applied:
 Unapplied:
@@ -21,7 +21,6 @@ Unapplied:
   nd-winverbs-winverbs-nd-map-co: 202d6214fd415a43a23fc7a78ed848ef76650768
   etc-getopt-allow-use-of-for-co: 1fb77dede55968508543f56e7c2110a5f7b3711a
   winverbs-delete-critical-secti: 0ed525c3d5dcd01992c01fe902e7619f012c2810
-  winverbs-nd-winmad-mad-delete-: 98ff0e5123217cc40cee74912c4219afa0ffa289
   libibumad-fix-freeing-wrong-me: fe557bf9459a7d9555468ceaba4300115e067dac
   winverbs-lib-cache-pkey-table: e3694c9bf832ea2293353f87247cfc3b361cdeb1
   winverbs-ep-handle-receiving-r: c3e54aad1af69a41a4bd947eb2b236d235c962c2

diff --git a/patches/winverbs-nd-winmad-mad-delete- b/patches/winverbs-nd-winmad-mad-delete-
deleted file mode 100644 (file)
index f11e3d4..0000000
--- a/patches/winverbs-nd-winmad-mad-delete-
+++ /dev/null
@@ -1,66 +0,0 @@
-Bottom: 16f55abd9c5504fee416a714c1bf9a5546a6c302
-Top:    08484e50787a6a4b424c884ff7cde6db19b5e3d6
-Author: stansmith <stansmith@ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86>
-Date:   2010-01-15 23:13:42 +0000
-
-[WINVERBS,ND,WINMAD,MAD] delete critical sections when no longer needed.
-To avoid leaking memory, we need to call DeleteCriticalSection
-for all critical sections once they are no longer needed.
-
-Signed-off-by: Sean Hefty <sean.hefty@intel.com>
-
-
-git-svn-id: svn://openib.tc.cornell.edu/gen1@2670 ad392aa1-c5ef-ae45-8dd8-e69d62a5ef86
-
-
----
-
-diff --git a/branches/WOF2-2/core/winmad/user/wm_provider.cpp b/branches/WOF2-2/core/winmad/user/wm_provider.cpp
-index 96c20da..b0adc07 100644
---- a/branches/WOF2-2/core/winmad/user/wm_provider.cpp
-+++ b/branches/WOF2-2/core/winmad/user/wm_provider.cpp
-@@ -64,6 +64,8 @@ CWMProvider::~CWMProvider()
-               CloseHandle(m_OverlapWrite.hEvent);\r
-       }\r
-       CloseHandle(m_hFile);\r
-+      DeleteCriticalSection(&m_CritSecRead);\r
-+      DeleteCriticalSection(&m_CritSecWrite);\r
-       InterlockedDecrement(&WmRef);\r
- }\r
- \r
-diff --git a/branches/WOF2-2/core/winverbs/user/wv_base.cpp b/branches/WOF2-2/core/winverbs/user/wv_base.cpp
-index 52e9b6e..5ed4e9f 100644
---- a/branches/WOF2-2/core/winverbs/user/wv_base.cpp
-+++ b/branches/WOF2-2/core/winverbs/user/wv_base.cpp
-@@ -47,6 +47,7 @@ CWVBase::~CWVBase()
-       if (m_Overlap.hEvent != NULL) {\r
-               CloseHandle(m_Overlap.hEvent);\r
-       }\r
-+      DeleteCriticalSection(&m_CritSec);\r
- }\r
- \r
- STDMETHODIMP CWVBase::\r
-diff --git a/branches/WOF2-2/ulp/libibumad/src/umad.cpp b/branches/WOF2-2/ulp/libibumad/src/umad.cpp
-index 6204be0..62473e3 100644
---- a/branches/WOF2-2/ulp/libibumad/src/umad.cpp
-+++ b/branches/WOF2-2/ulp/libibumad/src/umad.cpp
-@@ -68,6 +68,7 @@ int umad_init(void)
- __declspec(dllexport)\r
- int umad_done(void)\r
- {\r
-+      DeleteCriticalSection(&crit_sec);\r
-       return 0;\r
- }\r
- \r
-diff --git a/branches/WOF2-2/ulp/netdirect/user/nd_adapter.cpp b/branches/WOF2-2/ulp/netdirect/user/nd_adapter.cpp
-index 107a44e..805f77b 100644
---- a/branches/WOF2-2/ulp/netdirect/user/nd_adapter.cpp
-+++ b/branches/WOF2-2/ulp/netdirect/user/nd_adapter.cpp
-@@ -96,6 +96,7 @@ CNDAdapter::~CNDAdapter(void)
-               m_pWvProvider->Release();\r
-       }\r
-       m_pProvider->Release();\r
-+      DeleteCriticalSection(&m_Lock);\r
- }\r
- \r
- STDMETHODIMP CNDAdapter::