Bring the code up-to-date with the latest repository

This commit was SVN r2508.

src/mca/ptl/elan/src/ptl_elan.c

@@ -439,12 +439,8 @@ mca_ptl_elan_matched (mca_ptl_base_module_t * ptl,
     }
 
     /* Process the fragment */
-#if 1
-    set = fetchNset (&((mca_ptl_elan_recv_frag_t *)frag)->frag_progressed, 1);
-#else
     set = ompi_atomic_fetch_and_set_int (
 	    &((mca_ptl_elan_recv_frag_t *)frag)->frag_progressed, 1);
-#endif
     if (!set) {
 	/* IN TCP case, IO_VEC is first allocated.
 	 * then recv the data, and copy if needed,

src/mca/ptl/elan/src/ptl_elan_frag.c

@@ -174,11 +174,7 @@ mca_ptl_elan_send_desc_done (
 		& MCA_PTL_FLAGS_ACK_MATCHED)
 	    || mca_pml_base_send_request_matched(req)) {
 
-#if 1
-	if(fetchNset(&desc->frag_progressed, 1) == 0)
-#else
 	if(ompi_atomic_fetch_and_set_int (&desc->frag_progressed, 1) == 0) 
-#endif
 	{
 	    ptl->super.ptl_send_progress(ptl, req, 
 		    header->hdr_frag.hdr_frag_length);

src/mca/ptl/elan/src/ptl_elan_priv.c

@@ -151,12 +151,7 @@ mca_ptl_elan_last_frag_ack (struct mca_ptl_elan_module_t *ptl,
 	     req->req_peer_addr.pval,
 	     req->req_peer_size);
 
-#if 1
-    if(fetchNset(&desc->frag_progressed, 1) == 0)
-#else
-    if(ompi_atomic_fetch_and_set_int (&desc->frag_progressed, 1) == 0) 
-#endif
-    {
+    if(ompi_atomic_fetch_and_set_int (&desc->frag_progressed, 1) == 0) {
 	ptl->super.ptl_send_progress(ptl, req, header->hdr_ack.hdr_dst_size);
     }