Merge pull request #5194 from edgargabriel/pr/condition-fix

edgargabriel · web-flow · commit 09f73f1cd557 · 2018-05-24T19:18:37.000-05:00
io/ompio: fix an erroneous condition when selecting aggregator selection algorithm
diff --git a/ompi/mca/common/ompio/common_ompio_file_view.c b/ompi/mca/common/ompio/common_ompio_file_view.c
@@ -172,7 +172,7 @@ int mca_common_ompio_set_view (mca_io_ompio_file_t *fh,
        }
     }
 
-    if ( SIMPLE != mca_io_ompio_grouping_option || SIMPLE_PLUS != mca_io_ompio_grouping_option ) {
+    if ( SIMPLE != mca_io_ompio_grouping_option && SIMPLE_PLUS != mca_io_ompio_grouping_option ) {
 
         ret = mca_io_ompio_fview_based_grouping(fh,
                                                 &num_groups,

Original file line number	Diff line number	Diff line change
`@@ -172,7 +172,7 @@ int mca_common_ompio_set_view (mca_io_ompio_file_t *fh,`
`172`	`172`	`}`
`173`	`173`	`}`
`174`	`174`
`175`		`- if ( SIMPLE != mca_io_ompio_grouping_option \|\| SIMPLE_PLUS != mca_io_ompio_grouping_option ) {`
	`175`	`+ if ( SIMPLE != mca_io_ompio_grouping_option && SIMPLE_PLUS != mca_io_ompio_grouping_option ) {`
`176`	`176`
`177`	`177`	`ret = mca_io_ompio_fview_based_grouping(fh,`
`178`	`178`	`&num_groups,`