diff --git a/ompi/mca/pml/ob1/pml_ob1_isend.c b/ompi/mca/pml/ob1/pml_ob1_isend.c index 8c9334764d7..b3e1741a239 100644 --- a/ompi/mca/pml/ob1/pml_ob1_isend.c +++ b/ompi/mca/pml/ob1/pml_ob1_isend.c @@ -143,7 +143,7 @@ static inline int mca_pml_ob1_send_inline (const void *buf, size_t count, } if (OPAL_UNLIKELY(OMPI_SUCCESS != rc)) { - return rc; + return rc; } return (int) size; diff --git a/opal/mca/btl/sm/btl_sm_send.c b/opal/mca/btl/sm/btl_sm_send.c index ca9aca0cf81..34ac9295d7b 100644 --- a/opal/mca/btl/sm/btl_sm_send.c +++ b/opal/mca/btl/sm/btl_sm_send.c @@ -73,18 +73,4 @@ int mca_btl_sm_send(struct mca_btl_base_module_t *btl, struct mca_btl_base_endpo } return OPAL_SUCCESS; - -#if 0 - if (((frag->hdr->flags & MCA_BTL_SM_FLAG_SINGLE_COPY) || - !(frag->base.des_flags & MCA_BTL_DES_FLAGS_BTL_OWNERSHIP)) && - frag->base.des_cbfunc) { - frag->base.des_flags |= MCA_BTL_DES_SEND_ALWAYS_CALLBACK; - - return OPAL_SUCCESS; - } - - /* data is gone (from the pml's perspective). frag callback/release will - happen later */ - return 1; -#endif }