From 3cc539cf81d6e1e1077ee956c180c4e77f5409d0 Mon Sep 17 00:00:00 2001 From: "U-AMR\\MSHEFTY" Date: Wed, 6 Jan 2010 17:05:18 -0800 Subject: [PATCH] refresh (create temporary patch) --- meta | 5 ++-- patches/refresh-temp | 58 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 61 insertions(+), 2 deletions(-) create mode 100644 patches/refresh-temp diff --git a/meta b/meta index a6ecf4f0..0e3e5d50 100644 --- a/meta +++ b/meta @@ -1,10 +1,11 @@ Version: 1 -Previous: 481b47b6dad6bde04b5a08d83a8ec78963b43cc8 -Head: 90a6aedbf678173e0a74d6567a87da7ca4af6ba5 +Previous: 5842fc74a135fe6ae67c11c785a7eafb33fee64a +Head: 0408ba747c1fe855f110b51f3e9317175c3ddaf4 Applied: rm-build: d6d2302f2d258fa2c07e55a2e124a9bdd75367a0 cm_listen_handler: 56372fe5e423b7238a4db99258c1493748c0a582 cm_poll: 90a6aedbf678173e0a74d6567a87da7ca4af6ba5 + refresh-temp: 0408ba747c1fe855f110b51f3e9317175c3ddaf4 Unapplied: old-bld-32: bd1bd1d366e3927b7646da33e243213a5d59c235 old-apphang: 7a6f7ff02c6035e54fc262414eb9484ea98018b9 diff --git a/patches/refresh-temp b/patches/refresh-temp new file mode 100644 index 00000000..63eb8ac3 --- /dev/null +++ b/patches/refresh-temp @@ -0,0 +1,58 @@ +Bottom: 320329bcea61ab9c1c6da4cb408e769a18685487 +Top: 1547ce30760ad3ad2e5f75b6bc3f5fea149e4690 +Author: U-AMR\MSHEFTY +Date: 2010-01-06 17:05:15 -0800 + +Refresh of cm_poll + +--- + +diff --git a/trunk/core/al/kernel/al_cm.c b/trunk/core/al/kernel/al_cm.c +index d22901f..7bc4b51 100644 +--- a/trunk/core/al/kernel/al_cm.c ++++ b/trunk/core/al/kernel/al_cm.c +@@ -119,7 +119,7 @@ cm_get_request(iba_cm_id *p_listen_id, iba_cm_id **pp_id, iba_cm_event *p_event) + + ib_status = al_cep_poll(gh_al, p_listen_id->cid, &context, &new_cid, &mad); + if (ib_status != IB_SUCCESS) { +- return ib_to_ntstatus(ib_status); ++ return STATUS_NO_MORE_ENTRIES; + } + + *pp_id = cm_alloc_id(p_listen_id->callback, p_listen_id); +diff --git a/trunk/core/al/kernel/al_cm_cep.c b/trunk/core/al/kernel/al_cm_cep.c +index 4987207..a380e9c 100644 +--- a/trunk/core/al/kernel/al_cm_cep.c ++++ b/trunk/core/al/kernel/al_cm_cep.c +@@ -6376,7 +6376,7 @@ al_cep_poll( + { + ib_api_status_t status; + kcep_t *p_cep; +- KLOCK_QUEUE_HANDLE hdl; ++ KIRQL irql; + + AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("[ CID = %d\n", cid) ); + +@@ -6384,11 +6384,11 @@ al_cep_poll( + CL_ASSERT( p_new_cid ); + CL_ASSERT( pp_mad ); + +- KeAcquireInStackQueuedSpinLock( &gp_cep_mgr->lock, &hdl ); ++ KeAcquireSpinLock( &gp_cep_mgr->lock, &irql ); + p_cep = __lookup_cep( h_al, cid ); + if( !p_cep ) + { +- KeReleaseInStackQueuedSpinLock( &hdl ); ++ KeReleaseSpinLock( &gp_cep_mgr->lock, irql ); + AL_EXIT( AL_DBG_CM ); + return IB_INVALID_HANDLE; + } +@@ -6417,7 +6417,7 @@ al_cep_poll( + status = IB_SUCCESS; + + done: +- KeReleaseInStackQueuedSpinLock( &hdl ); ++ KeReleaseSpinLock( &gp_cep_mgr->lock, irql ); + AL_PRINT( TRACE_LEVEL_VERBOSE, AL_DBG_CM, ("] return %d\n", status) ); + return status; + } -- 2.46.0