From 466394a87828cbbb5d46dd13da6cfe86245de354 Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Wed, 29 Aug 2007 01:36:17 +0000 Subject: [PATCH] We only care about the value of ret in the !OMPI_ENABLE_PROGRESS_THREADS case. Reviewed by Brian. This commit was SVN r16000. --- ompi/mca/osc/pt2pt/osc_pt2pt_component.c | 4 ++-- ompi/mca/osc/rdma/osc_rdma_component.c | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c index 059aef53f5..29e1697c81 100644 --- a/ompi/mca/osc/pt2pt/osc_pt2pt_component.c +++ b/ompi/mca/osc/pt2pt/osc_pt2pt_component.c @@ -691,14 +691,14 @@ int ompi_osc_pt2pt_component_progress(void) { opal_list_item_t *item; - int ret = 0, done = 0; + int ret, done = 0; #if OMPI_ENABLE_PROGRESS_THREADS OPAL_THREAD_LOCK(&mca_osc_pt2pt_component.p2p_c_lock); #else ret = OPAL_THREAD_TRYLOCK(&mca_osc_pt2pt_component.p2p_c_lock); -#endif if (ret != 0) return 0; +#endif for (item = opal_list_get_first(&mca_osc_pt2pt_component.p2p_c_pending_requests) ; item != opal_list_get_end(&mca_osc_pt2pt_component.p2p_c_pending_requests) ; diff --git a/ompi/mca/osc/rdma/osc_rdma_component.c b/ompi/mca/osc/rdma/osc_rdma_component.c index be89bbbf15..3186de8d25 100644 --- a/ompi/mca/osc/rdma/osc_rdma_component.c +++ b/ompi/mca/osc/rdma/osc_rdma_component.c @@ -932,8 +932,8 @@ ompi_osc_rdma_component_progress(void) OPAL_THREAD_LOCK(&mca_osc_rdma_component.c_lock); #else ret = OPAL_THREAD_TRYLOCK(&mca_osc_rdma_component.c_lock); -#endif if (ret != 0) return 0; +#endif for (item = opal_list_get_first(&mca_osc_rdma_component.c_pending_requests) ; item != opal_list_get_end(&mca_osc_rdma_component.c_pending_requests) ;