osc/rdma: use OPAL_ALIGN macro

cmr=v1.7.5:ticket=trac:4357

This commit was SVN r30975.

The following Trac tickets were found above:
  Ticket 4357 --> https://svn.open-mpi.org/trac/ompi/ticket/4357

ompi/mca/osc/rdma/osc_rdma_data_move.c

@@ -1361,8 +1361,8 @@ static inline int process_frag (ompi_osc_rdma_module_t *module,
         }
 
         /* the next header will start on an 8-byte boundary. this is done to ensure
-         * that the packed datatype is properly aligned */
-        header = (ompi_osc_rdma_header_t *) (((uintptr_t) header + ret + 0x07) & ~0x07);
+         * that the next header and the packed datatype is properly aligned */
+        header = (ompi_osc_rdma_header_t *) OPAL_ALIGN(((uintptr_t) header + ret), 8, uintptr_t);
     }
 
     return OMPI_SUCCESS;

ompi/mca/osc/rdma/osc_rdma_frag.h

@@ -17,6 +17,7 @@
 
 #include "osc_rdma_header.h"
 #include "osc_rdma_request.h"
+#include "opal/align.h"
 
 /** Communication buffer for packing messages */
 struct ompi_osc_rdma_frag_t {
@@ -54,8 +55,10 @@ static inline int ompi_osc_rdma_frag_alloc(ompi_osc_rdma_module_t *module, int t
     ompi_osc_rdma_frag_t *curr = module->peers[target].active_frag;
     int ret;
 
-    /* ensure the next fragment will be allocated on an 8-byte boundary */
-    request_len = (request_len + 0x7) & ~0x7;
+    /* osc rdma headers can have 64-bit values. these will need to be aligned
+     * on an 8-byte boundary on some architectures so we up align the allocation
+     * size here. */
+    request_len = OPAL_ALIGN(request_len, 8, size_t);
 
     if (request_len > mca_osc_rdma_component.buffer_size) {
         return OMPI_ERR_OUT_OF_RESOURCE;