io/ompio: fix for CID 1645290

move the lock protection to include setting the flag indicating that a
split collective is already ongoing. Unify the handling for
write_all_begin, write_at_all_begin, read_all_begin, read_at_all_begin
(even if coverty only complained about one of them).

Signed-off-by: Edgar Gabriel <[email protected]>

Author: edgargabriel

ompi/mca/io/ompio/io_ompio_file_read.c

@@ -366,9 +366,11 @@ int mca_io_ompio_file_read_all_begin (ompi_file_t *fh,
 	printf("Only one split collective I/O operation allowed per file handle at any given point in time!\n");
 	return MPI_ERR_OTHER;
     }
-    /* No need for locking fh->f_lock, that is done in file_iread_all */
+
+    OPAL_THREAD_LOCK(&fh->f_lock);
     ret = mca_io_ompio_file_iread_all ( fh, buf, count, datatype, &fp->f_split_coll_req );
     fp->f_split_coll_in_use = true;
+    OPAL_THREAD_UNLOCK(&fh->f_lock);
 
     return ret;
 }
@@ -408,8 +410,8 @@ int mca_io_ompio_file_read_at_all_begin (ompi_file_t *fh,
     }
     OPAL_THREAD_LOCK(&fh->f_lock);
     ret = mca_common_ompio_file_iread_at_all ( fp, offset, buf, count, datatype, &fp->f_split_coll_req );
-    OPAL_THREAD_UNLOCK(&fh->f_lock);
     fp->f_split_coll_in_use = true;
+    OPAL_THREAD_UNLOCK(&fh->f_lock);
     return ret;
 }
 

ompi/mca/io/ompio/io_ompio_file_write.c

@@ -374,9 +374,11 @@ int mca_io_ompio_file_write_all_begin (ompi_file_t *fh,
 	printf("Only one split collective I/O operation allowed per file handle at any given point in time!\n");
 	return MPI_ERR_OTHER;
     }
-    /* No need for locking fh->f_lock, that is done in file_iwrite_all */
+
+    OPAL_THREAD_LOCK(&fh->f_lock);
     ret = mca_io_ompio_file_iwrite_all ( fh, buf, count, datatype, &fp->f_split_coll_req );
     fp->f_split_coll_in_use = true;
+    OPAL_THREAD_UNLOCK(&fh->f_lock);
 
     return ret;
 }
@@ -418,8 +420,8 @@ int mca_io_ompio_file_write_at_all_begin (ompi_file_t *fh,
     }
     OPAL_THREAD_LOCK(&fh->f_lock);
     ret = mca_common_ompio_file_iwrite_at_all ( fp, offset, buf, count, datatype, &fp->f_split_coll_req );
-    OPAL_THREAD_UNLOCK(&fh->f_lock);
     fp->f_split_coll_in_use = true;
+    OPAL_THREAD_UNLOCK(&fh->f_lock);
 
     return ret;
 }