From dafb5e6412c2bbc0f4d167f991fd0fd144441486 Mon Sep 17 00:00:00 2001 From: Sean Hefty Date: Thu, 4 Mar 2010 13:56:13 -0800 Subject: [PATCH] delete --- meta | 3 +- patches/dapl-cleanup2 | 77 ------------------------------------------- 2 files changed, 1 insertion(+), 79 deletions(-) delete mode 100644 patches/dapl-cleanup2 diff --git a/meta b/meta index 7574daf8..357666a4 100644 --- a/meta +++ b/meta @@ -1,10 +1,9 @@ Version: 1 -Previous: b310c688f332badf46cede6b278edc8e792e06d9 +Previous: 8623f70846d10aebffc8439cca17d61fa97795a9 Head: 4995b96e85b23b65fcc1a770625f410f3f5469e8 Applied: rm-build: 4995b96e85b23b65fcc1a770625f410f3f5469e8 Unapplied: - dapl-cleanup2: 81e62e90410bb28ef7b1d23f0f6d7e50aede57a2 libibverbs-release2: 0667602ed1c1de91a91eced340ef3c68c91453fe debug-wv: f98e9be2365ed35d30abdf31128c331322849c93 dapl-queue: eae59391d42fc62a1790bad6abf914274720f81c diff --git a/patches/dapl-cleanup2 b/patches/dapl-cleanup2 deleted file mode 100644 index 5702f0af..00000000 --- a/patches/dapl-cleanup2 +++ /dev/null @@ -1,77 +0,0 @@ -Bottom: 5949be80df90f7b34e3080d4fb9d318af06f8515 -Top: 7ac9835d176d027d31e4f038ef3bad409a033c9b -Author: Sean Hefty -Date: 2010-02-03 17:03:47 -0800 - -dapl: release completion channels - -Cleanup allocated completion channels. - -Signed-off-by: Sean Hefty - - ---- - -diff --git a/trunk/ulp/dapl2/dapl/openib_cma/device.c b/trunk/ulp/dapl2/dapl/openib_cma/device.c -index 32090fb..c9d3756 100644 ---- a/trunk/ulp/dapl2/dapl/openib_cma/device.c -+++ b/trunk/ulp/dapl2/dapl/openib_cma/device.c -@@ -502,6 +502,16 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) - dapl_os_sleep_usec(1000); - } - bail: -+ if (hca_ptr->ib_trans.ib_cq) -+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); -+ -+ if (hca_ptr->ib_trans.ib_cq_empty) { -+ struct ibv_comp_channel *channel; -+ channel = hca_ptr->ib_trans.ib_cq_empty->channel; -+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); -+ ibv_destroy_comp_channel(channel); -+ } -+ - 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")); -diff --git a/trunk/ulp/dapl2/dapl/openib_scm/device.c b/trunk/ulp/dapl2/dapl/openib_scm/device.c -index bb3893a..04e992a 100644 ---- a/trunk/ulp/dapl2/dapl/openib_scm/device.c -+++ b/trunk/ulp/dapl2/dapl/openib_scm/device.c -@@ -504,6 +504,16 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) - } - - out: -+ if (hca_ptr->ib_trans.ib_cq) -+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); -+ -+ if (hca_ptr->ib_trans.ib_cq_empty) { -+ struct ibv_comp_channel *channel; -+ channel = hca_ptr->ib_trans.ib_cq_empty->channel; -+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); -+ ibv_destroy_comp_channel(channel); -+ } -+ - 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")); -diff --git a/trunk/ulp/dapl2/dapl/openib_ucm/device.c b/trunk/ulp/dapl2/dapl/openib_ucm/device.c -index e890eef..a9cec73 100644 ---- a/trunk/ulp/dapl2/dapl/openib_ucm/device.c -+++ b/trunk/ulp/dapl2/dapl/openib_ucm/device.c -@@ -401,6 +401,16 @@ DAT_RETURN dapls_ib_close_hca(IN DAPL_HCA * hca_ptr) - destroy_os_signal(hca_ptr); - ucm_service_destroy(hca_ptr); - -+ if (hca_ptr->ib_trans.ib_cq) -+ ibv_destroy_comp_channel(hca_ptr->ib_trans.ib_cq); -+ -+ if (hca_ptr->ib_trans.ib_cq_empty) { -+ struct ibv_comp_channel *channel; -+ channel = hca_ptr->ib_trans.ib_cq_empty->channel; -+ ibv_destroy_cq(hca_ptr->ib_trans.ib_cq_empty); -+ ibv_destroy_comp_channel(channel); -+ } -+ - 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")); -- 2.46.0