bcol/iboffload: fix more errors from param -> var updates

This commit was SVN r28281.

ompi/mca/bcol/iboffload/bcol_iboffload.h

@@ -180,11 +180,11 @@ struct mca_bcol_iboffload_component_t {
     /** max outstanding CQE on the CQ */
     int cq_size;
     /** Max size of inline data */
-    int max_inline_data;
+    unsigned int max_inline_data;
     /** IB partition definition */
     uint32_t pkey_val;
     /** Outstanding atomic reads */
-    uint32_t qp_ous_rd_atom;
+    unsigned int qp_ous_rd_atom;
     /** IB MTU */
     int mtu;
     /** Recv not ready timer */
@@ -242,7 +242,7 @@ struct mca_bcol_iboffload_component_t {
       * and set this flag to true */
     bool init_done;
     /** Maximal number of fragments of the same colective request that can be sent in parallel */
-    uint32_t max_pipeline_depth;
+    unsigned int max_pipeline_depth;
     /** array mapping Open MPI reduction operators to MVerbs reduction operators */
     enum ibv_m_wr_calc_op map_ompi_to_ib_calcs[OMPI_OP_NUM_OF_TYPES];
     /** array mapping Open MPI data types to MVerbs data types */

ompi/mca/bcol/iboffload/bcol_iboffload_component.c

@@ -99,7 +99,7 @@ mca_bcol_iboffload_component_t mca_bcol_iboffload_component = {
             iboffload_open,
             iboffload_close,
             NULL, /* query */
-            mca_bcol_iboffload_register_params
+            mca_bcol_iboffload_register_params,
             NULL, /* reserved */
         },
 
@@ -415,9 +415,7 @@ static int iboffload_open(void)
     }
 
     /* Check MCA parameters */
-    if (0 == (ival & (ival - 1))) {
+    if (0 != (mca_bcol_iboffload_component.exchange_tree_order & (mca_bcol_iboffload_component.exchange_tree_order - 1))) {
-        mca_bcol_iboffload_component.exchange_tree_order = ival;
-    } else {
         IBOFFLOAD_ERROR(("Warning: ibcol_iboffload_exchange_tree_order is %d which is not a power of 2, setting it to 2", ival));
         mca_bcol_iboffload_component.exchange_tree_order = 2;
     }

ompi/mca/bcol/iboffload/bcol_iboffload_mca.c

@@ -246,7 +246,7 @@ int mca_bcol_iboffload_register_params(void)
 
     CHECK(reg_int("max_pipeline_depth", NULL,
                   "The maximal number of fragments of the same collective request that can be transferred in parallel", 3,
-                  &mca_bcol_iboffload_component.max_pipeline_depth, 0));
+                  (int *) &mca_bcol_iboffload_component.max_pipeline_depth, 0));
 
     CHECK(reg_int("max_mqe_tasks", NULL,
                   "Maximum number of MQEs for each iboffload module",
@@ -293,7 +293,7 @@ int mca_bcol_iboffload_register_params(void)
                   "otherwise must be >= 0). "
                   "If not explicitly set, use max_inline_data from "
                   "the INI file containing device-specific parameters",
-                  128, &mca_bcol_iboffload_component.max_inline_data,
+                  128, (int *) &mca_bcol_iboffload_component.max_inline_data,
                   REGINT_NEG_ONE_OK | REGINT_GE_ZERO));
 
 #if 0
@@ -314,10 +314,8 @@ int mca_bcol_iboffload_register_params(void)
                      0));
 
     CHECK(reg_int("qp_ous_rd_atom", NULL,
-                  "InfiniBand outstanding atomic reads "
+                  "InfiniBand outstanding atomic reads (must be >= 0)", 4,
-                  "(must be >= 0)",
+                  (int *) &mca_bcol_iboffload_component.qp_ous_rd_atom, REGINT_GE_ZERO));
-                  4, &ival, REGINT_GE_ZERO));
-    mca_bcol_iboffload_component.qp_ous_rd_atom = (uint32_t) ival;
 
     asprintf(&msg, "OpenFabrics MTU, in bytes (if not specified in INI files).  Valid values are: %d=256 bytes, %d=512 bytes, %d=1024 bytes, %d=2048 bytes, %d=4096 bytes",
              IBV_MTU_256,