fix merge

This commit was SVN r26332.

ompi/mca/btl/ugni/btl_ugni_component.c

@@ -360,8 +360,6 @@ mca_btl_ugni_progress_datagram (mca_btl_ugni_module_t *btl)
 
     ep = btl->endpoints[remote_id];
 
-    OPAL_THREAD_LOCK(&ep->common->lock);
-
     /* NTH: TODO -- error handling */
     (void) mca_btl_ugni_ep_connect_progress (ep);
 
@@ -370,8 +368,6 @@ mca_btl_ugni_progress_datagram (mca_btl_ugni_module_t *btl)
         count = mca_btl_ugni_smsg_process (ep);
     }
 
-    OPAL_THREAD_UNLOCK(&ep->common->lock);
-
     if ((datagram_id & MCA_BTL_UGNI_DATAGRAM_MASK) ==
         MCA_BTL_UGNI_CONNECT_WILDCARD_ID) {
         mca_btl_ugni_wildcard_ep_post (btl);

ompi/mca/btl/ugni/btl_ugni_module.c

@@ -169,7 +169,8 @@ static int
 mca_btl_ugni_module_finalize (struct mca_btl_base_module_t *btl)
 {
     mca_btl_ugni_module_t *ugni_module = (mca_btl_ugni_module_t *)btl;
-    int rc, i;
+    unsigned int i;
+    int rc;
 
     OBJ_DESTRUCT(&ugni_module->eager_frags_send);
     OBJ_DESTRUCT(&ugni_module->eager_frags_recv);
@@ -290,10 +291,6 @@ mca_btl_ugni_prepare_src (struct mca_btl_base_module_t *btl,
                           uint8_t order, size_t reserve, size_t *size,
                           uint32_t flags)
 {
-    mca_btl_ugni_base_frag_t *frag = NULL;
-    void *data_ptr;
-    int rc;
-
     if (OPAL_LIKELY(reserve)) {
         return mca_btl_ugni_prepare_src_send (btl, endpoint, convertor,
                                               order, reserve, size, flags);

ompi/mca/btl/ugni/btl_ugni_send.c

@@ -65,7 +65,7 @@ int mca_btl_ugni_send (struct mca_btl_base_module_t *btl,
     }
 
     if (frag->is_buffered && (flags_save & MCA_BTL_DES_FLAGS_BTL_OWNERSHIP)) {
-        /* fast(ish) path: btl own frag and it is buffered. report frag as complete */
+        /* fast(ish) path: btl owned buffered frag. report send as complete */
         frag->base.des_flags = flags_save & ~MCA_BTL_DES_SEND_ALWAYS_CALLBACK;
 
         if (OPAL_LIKELY(flags_save & MCA_BTL_DES_SEND_ALWAYS_CALLBACK)) {

ompi/mca/btl/ugni/btl_ugni_smsg.h

@@ -82,7 +82,6 @@ static inline int ompi_mca_btl_ugni_smsg_send (mca_btl_ugni_base_frag_t *frag,
                                                void *payload, size_t payload_len,
                                                mca_btl_ugni_smsg_tag_t tag) {
     gni_return_t grc;
-    int rc;
 
     grc = GNI_SmsgSendWTag (frag->endpoint->smsg_ep_handle, hdr, hdr_len, payload, payload_len,
                            ignore_local_comp ? (uint32_t) -1 : frag->msg_id, tag);
@@ -100,7 +99,7 @@ static inline int ompi_mca_btl_ugni_smsg_send (mca_btl_ugni_base_frag_t *frag,
         }
 
         BTL_ERROR(("GNI_SmsgSendWTag failed with rc = %d. handle = %d, hdr_len = %d, payload_len = %d",
-                   grc, frag->endpoint->smsg_ep_handle, hdr_len, payload_len));
+                   grc, (int) frag->endpoint->smsg_ep_handle, (int) hdr_len, (int) payload_len));
 
         return OMPI_ERROR;
     }

ompi/mca/common/ugni/common_ugni.c

@@ -152,8 +152,6 @@ static int ompi_common_ugni_device_init (ompi_common_ugni_device_t *device,
 
 static int ompi_common_ugni_device_fini (ompi_common_ugni_device_t *dev)
 {
-    int rc;
-
     if (dev->dev_eps) {
         free (dev->dev_eps);
         dev->dev_eps = NULL;