From 758f7ab76809f71a9d83cf2f8455e84e039bba46 Mon Sep 17 00:00:00 2001 From: Gilles Gouaillardet Date: Thu, 20 Nov 2014 16:04:55 +0900 Subject: [PATCH] Revert "btl/vader: use FRAG_ALLOC_USER when single_copy_mechanism is VADER_NONE" as discussed with @hjelmn in open-mpi/ompi-release#86 This reverts commit d2d7f39a4bc8dde7e8c480f248819ec0d0e6be62. --- opal/mca/btl/vader/btl_vader_module.c | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/opal/mca/btl/vader/btl_vader_module.c b/opal/mca/btl/vader/btl_vader_module.c index fe9e541561..2104f341cd 100644 --- a/opal/mca/btl/vader/btl_vader_module.c +++ b/opal/mca/btl/vader/btl_vader_module.c @@ -450,11 +450,7 @@ struct mca_btl_base_descriptor_t *vader_prepare_dst(struct mca_btl_base_module_t mca_btl_vader_frag_t *frag; void *data_ptr; - if (MCA_BTL_VADER_NONE != mca_btl_vader_component.single_copy_mechanism) { - (void) MCA_BTL_VADER_FRAG_ALLOC_RDMA(frag, endpoint); - } else { - (void) MCA_BTL_VADER_FRAG_ALLOC_USER(frag, endpoint); - } + (void) MCA_BTL_VADER_FRAG_ALLOC_RDMA(frag, endpoint); if (OPAL_UNLIKELY(NULL == frag)) { return NULL; } @@ -596,11 +592,7 @@ static struct mca_btl_base_descriptor_t *vader_prepare_src (struct mca_btl_base_ } } else { /* put/get fragment */ - if (MCA_BTL_VADER_NONE != mca_btl_vader_component.single_copy_mechanism) { - (void) MCA_BTL_VADER_FRAG_ALLOC_RDMA(frag, endpoint); - } else { - (void) MCA_BTL_VADER_FRAG_ALLOC_USER(frag, endpoint); - } + (void) MCA_BTL_VADER_FRAG_ALLOC_RDMA(frag, endpoint); if (OPAL_UNLIKELY(NULL == frag)) { return NULL; }