Some refactoring prior to implementing new H5P MPI functions.

* Macro cleanup and obvious warning fixes in parallel code.
* Moved H5FD comm and info dup/free wrapper code to a new H5mpi.c file
  and separated it to deal with each MPI type separately.

9 files changed, 566 insertions, 484 deletions

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 17fd949..313d231 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -8,6 +8,7 @@ set (H5_SOURCES
     ${HDF5_SRC_DIR}/H5.c
     ${HDF5_SRC_DIR}/H5checksum.c
     ${HDF5_SRC_DIR}/H5dbg.c
+    ${HDF5_SRC_DIR}/H5mpi.c
     ${HDF5_SRC_DIR}/H5system.c
     ${HDF5_SRC_DIR}/H5timer.c
     ${HDF5_SRC_DIR}/H5trace.c
diff --git a/src/H5ACmpio.c b/src/H5ACmpio.c
index b60b933..e4b81fa 100644
--- a/src/H5ACmpio.c
+++ b/src/H5ACmpio.c
@@ -821,9 +821,8 @@ H5AC__log_cleaned_entry(const H5AC_info_t *entry_ptr)
 {
     H5AC_t             * cache_ptr;
     H5AC_aux_t         * aux_ptr;
-    herr_t               ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_PACKAGE
+    FUNC_ENTER_PACKAGE_NOERR
 
     /* Sanity check */
     HDassert(entry_ptr);
@@ -853,8 +852,7 @@ H5AC__log_cleaned_entry(const H5AC_info_t *entry_ptr)
     /* Decrement the dirty byte count */
     aux_ptr->dirty_bytes -= entry_ptr->size;
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5AC__log_cleaned_entry() */
 
 
diff --git a/src/H5FDmpi.c b/src/H5FDmpi.c
index 7d58b7a..b2959a5 100644
--- a/src/H5FDmpi.c
+++ b/src/H5FDmpi.c
@@ -267,115 +267,6 @@ H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/)
     FUNC_LEAVE_NOAPI(ret_value)
 }
 
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_mpi_comm_info_dup
- *
- * Purpose:     Make duplicates of communicator and Info object.
- * 		If the Info object is in fact MPI_INFO_NULL, no duplicate
- * 		is made but the same value assigned to the new Info object
- * 		handle.
- *
- * Return:      Success:	Non-negative.  The new communicator and Info
- * 				object handles are returned via comm_new and
- * 				info_new pointers.
- *
- * 		Failure:	Negative.
- *
- * Programmer:  Albert Cheng
- *              Jan  8, 2003
- *
- * Modifications:
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info, MPI_Comm *comm_new, MPI_Info *info_new)
-{
-    herr_t	ret_value=SUCCEED;
-    MPI_Comm	comm_dup=MPI_COMM_NULL;
-    MPI_Info	info_dup=MPI_INFO_NULL;
-    int		mpi_code;
-
-    FUNC_ENTER_NOAPI(FAIL)
-
-    /* Check arguments */
-    if (MPI_COMM_NULL == comm)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "not a valid argument")
-    if (!comm_new || !info_new)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "bad pointers")
-
-    /* Dup them.  Using temporary variables for error recovery cleanup. */
-    if (MPI_SUCCESS != (mpi_code=MPI_Comm_dup(comm, &comm_dup)))
-	HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
-    if (MPI_INFO_NULL != info){
-	if (MPI_SUCCESS != (mpi_code=MPI_Info_dup(info, &info_dup)))
-	    HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
-    }else{
-	/* No dup, just copy it. */
-	info_dup = info;
-    }
-
-    /* Set MPI_ERRORS_RETURN on comm_dup so that MPI failures are not fatal, 
-       and return codes can be checked and handled. May 23, 2017 FTW */
-    if (MPI_SUCCESS != (mpi_code = MPI_Comm_set_errhandler(comm_dup, MPI_ERRORS_RETURN)))
-        HMPI_GOTO_ERROR(FAIL, "MPI_Errhandler_set failed", mpi_code)
- 
-    /* copy them to the return arguments */
-    *comm_new = comm_dup;
-    *info_new = info_dup;
-
-done:
-    if (FAIL == ret_value){
-	/* need to free anything created here */
-	if (MPI_COMM_NULL != comm_dup)
-	    MPI_Comm_free(&comm_dup);
-	if (MPI_INFO_NULL != info_dup)
-	    MPI_Info_free(&info_dup);
-    }
-
-    FUNC_LEAVE_NOAPI(ret_value)
-}
-
-
-/*-------------------------------------------------------------------------
- * Function:    H5FD_mpi_comm_info_free
- *
- * Purpose:     Free the communicator and Info object.
- * 		If comm or info is in fact MPI_COMM_NULL or MPI_INFO_NULL
- * 		respectively, no action occurs to it.
- *
- * Return:      Success:	Non-negative.  The values the pointers refer
- * 				to will be set to the corresponding NULL
- * 				handles.
- *
- * 		Failure:	Negative.
- *
- * Programmer:  Albert Cheng
- *              Jan  8, 2003
- *
- * Modifications:
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info)
-{
-    herr_t      ret_value=SUCCEED;
-
-    FUNC_ENTER_NOAPI(FAIL)
-
-    /* Check arguments */
-    if (!comm || !info)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "not a valid argument")
-
-    if (MPI_COMM_NULL != *comm)
-	MPI_Comm_free(comm);
-    if (MPI_INFO_NULL != *info)
-	MPI_Info_free(info);
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-}
-
 #ifdef NOT_YET
 
 /*-------------------------------------------------------------------------
diff --git a/src/H5FDmpio.c b/src/H5FDmpio.c
index d5aa170..6ca7aa4 100644
--- a/src/H5FDmpio.c
+++ b/src/H5FDmpio.c
@@ -167,7 +167,7 @@ USAGE
     herr_t H5FD__init_package()
 
 RETURNS
-    Non-negative on success/Negative on failure
+    SUCCEED/FAIL
 
 DESCRIPTION
     Initializes any interface-specific data or routines.  (Just calls
@@ -249,9 +249,9 @@ done:
 
 
 /*---------------------------------------------------------------------------
- * Function:	H5FD__mpio_term
+ * Function:    H5FD__mpio_term
  *
- * Purpose:	Shut down the VFD
+ * Purpose:     Shut down the VFD
  *
  * Returns:     Non-negative on success or negative on failure
  *
@@ -263,7 +263,7 @@ done:
 static herr_t
 H5FD__mpio_term(void)
 {
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Reset VFL ID */
     H5FD_MPIO_g = 0;
@@ -273,40 +273,40 @@ H5FD__mpio_term(void)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_fapl_mpio
+ * Function:    H5Pset_fapl_mpio
  *
- * Purpose:	Store the user supplied MPIO communicator comm and info in
- *		the file access property list FAPL_ID which can then be used
- *		to create and/or open the file.  This function is available
- *		only in the parallel HDF5 library and is not collective.
+ * Purpose:     Store the user supplied MPIO communicator comm and info in
+ *              the file access property list FAPL_ID which can then be used
+ *              to create and/or open the file.  This function is available
+ *              only in the parallel HDF5 library and is not collective.
  *
- *		comm is the MPI communicator to be used for file open as
- *		defined in MPI_FILE_OPEN of MPI-2. This function makes a
- *		duplicate of comm. Any modification to comm after this function
- *		call returns has no effect on the access property list.
+ *              comm is the MPI communicator to be used for file open as
+ *              defined in MPI_FILE_OPEN of MPI-2. This function makes a
+ *              duplicate of comm. Any modification to comm after this function
+ *              call returns has no effect on the access property list.
  *
- *		info is the MPI Info object to be used for file open as
- *		defined in MPI_FILE_OPEN of MPI-2. This function makes a
- *		duplicate of info. Any modification to info after this
- *		function call returns has no effect on the access property
- *		list.
+ *              info is the MPI Info object to be used for file open as
+ *              defined in MPI_FILE_OPEN of MPI-2. This function makes a
+ *              duplicate of info. Any modification to info after this
+ *              function call returns has no effect on the access property
+ *              list.
  *
  *              If fapl_id has previously set comm and info values, they
  *              will be replaced and the old communicator and Info object
  *              are freed.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Albert Cheng
- *		Feb 3, 1998
+ * Programmer:  Albert Cheng
+ *              Feb 3, 1998
  *
  *-------------------------------------------------------------------------
  */
 herr_t
 H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
 {
-    H5FD_mpio_fapl_t	fa;
+    H5FD_mpio_fapl_t    fa;
     H5P_genplist_t *plist;      /* Property list pointer */
     herr_t ret_value;
 
@@ -319,7 +319,7 @@ H5Pset_fapl_mpio(hid_t fapl_id, MPI_Comm comm, MPI_Info info)
     if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a file access list")
     if(MPI_COMM_NULL == comm)
-	HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator")
+        HGOTO_ERROR(H5E_PLIST, H5E_BADTYPE, FAIL, "not a valid communicator")
 
     /* Initialize driver specific properties */
     HDmemset(&fa, 0, sizeof(H5FD_mpio_fapl_t));
@@ -335,25 +335,25 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pget_fapl_mpio
- *
- * Purpose:	If the file access property list is set to the H5FD_MPIO
- *		driver then this function returns duplicates of the MPI
- *		communicator and Info object stored through the comm and
- *		info pointers.  It is the responsibility of the application
- *		to free the returned communicator and Info object.
- *
- * Return:	Success:	Non-negative with the communicator and
- *				Info object returned through the comm and
- *				info arguments if non-null. Since they are
- *				duplicates of the stored objects, future
- *				modifications to the access property list do
- *				not affect them and it is the responsibility
- *				of the application to free them.
- * 		Failure:	Negative
- *
- * Programmer:	Robb Matzke
- *		Thursday, February 26, 1998
+ * Function:    H5Pget_fapl_mpio
+ *
+ * Purpose:     If the file access property list is set to the H5FD_MPIO
+ *              driver then this function returns duplicates of the MPI
+ *              communicator and Info object stored through the comm and
+ *              info pointers.  It is the responsibility of the application
+ *              to free the returned communicator and Info object.
+ *
+ * Return:      Success:    Non-negative with the communicator and
+ *                          Info object returned through the comm and
+ *                          info arguments if non-null. Since they are
+ *                          duplicates of the stored objects, future
+ *                          modifications to the access property list do
+ *                          not affect them and it is the responsibility
+ *                          of the application to free them.
+ *              Failure:    Negative
+ *
+ * Programmer:  Robb Matzke
+ *              Thursday, February 26, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -362,9 +362,9 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
 {
     H5P_genplist_t *plist;      /* Property list pointer */
     const H5FD_mpio_fapl_t *fa;       /* MPIO fapl info */
-    MPI_Comm	comm_tmp = MPI_COMM_NULL;
+    MPI_Comm    comm_tmp = MPI_COMM_NULL;
     hbool_t     comm_copied = FALSE;    /* MPI Comm has been duplicated */
-    int		mpi_code;		/* MPI return code */
+    int         mpi_code;               /* MPI return code */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_API(FAIL)
@@ -381,19 +381,19 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
     /* Store the duplicated communicator in a temporary variable for error */
     /* recovery in case the INFO duplication fails. */
     if(comm) {
-	if(MPI_SUCCESS != (mpi_code = MPI_Comm_dup(fa->comm, &comm_tmp)))
-	    HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
+        if(MPI_SUCCESS != (mpi_code = MPI_Comm_dup(fa->comm, &comm_tmp)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
         comm_copied = TRUE;
     } /* end if */
 
     if(info) {
-	if(MPI_INFO_NULL != fa->info) {
-	    if(MPI_SUCCESS != (mpi_code = MPI_Info_dup(fa->info, info)))
-		HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
-	} /* end if */
+        if(MPI_INFO_NULL != fa->info) {
+            if(MPI_SUCCESS != (mpi_code = MPI_Info_dup(fa->info, info)))
+                HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
+        } /* end if */
         else
-	    /* do not dup it */
-	    *info = MPI_INFO_NULL;
+            /* do not dup it */
+            *info = MPI_INFO_NULL;
     } /* end if */
 
     /* Store the copied communicator, now that the Info object has been
@@ -404,33 +404,33 @@ H5Pget_fapl_mpio(hid_t fapl_id, MPI_Comm *comm/*out*/, MPI_Info *info/*out*/)
 
 done:
     if(ret_value < 0)
-	/* need to free anything created here */
-	if(comm_copied)
-	    MPI_Comm_free(&comm_tmp);
+        /* need to free anything created here */
+        if(comm_copied)
+            MPI_Comm_free(&comm_tmp);
 
     FUNC_LEAVE_API(ret_value)
 } /* end H5Pget_fapl_mpio() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_dxpl_mpio
+ * Function:    H5Pset_dxpl_mpio
  *
- * Purpose:	Set the data transfer property list DXPL_ID to use transfer
- *		mode XFER_MODE. The property list can then be used to control
- *		the I/O transfer mode during data I/O operations. The valid
- *		transfer modes are:
+ * Purpose:     Set the data transfer property list DXPL_ID to use transfer
+ *              mode XFER_MODE. The property list can then be used to control
+ *              the I/O transfer mode during data I/O operations. The valid
+ *              transfer modes are:
  *
- * 		H5FD_MPIO_INDEPENDENT:
- *			Use independent I/O access (the default).
+ *              H5FD_MPIO_INDEPENDENT:
+ *                  Use independent I/O access (the default).
  *
- * 		H5FD_MPIO_COLLECTIVE:
- *			Use collective I/O access.
+ *              H5FD_MPIO_COLLECTIVE:
+ *                  Use collective I/O access.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Albert Cheng
- *		April 2, 1998
+ * Programmer:  Albert Cheng
+ *              April 2, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -461,18 +461,18 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pget_dxpl_mpio
+ * Function:    H5Pget_dxpl_mpio
  *
- * Purpose:	Queries the transfer mode current set in the data transfer
- *		property list DXPL_ID. This is not collective.
+ * Purpose:     Queries the transfer mode current set in the data transfer
+ *              property list DXPL_ID. This is not collective.
  *
- * Return:	Success:	Non-negative, with the transfer mode returned
- *				through the XFER_MODE argument if it is
- *				non-null.
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative, with the transfer mode returned
+ *                          through the XFER_MODE argument if it is
+ *                          non-null.
+ *              Failure:    Negative
  *
- * Programmer:	Albert Cheng
- *		April 2, 1998
+ * Programmer:  Albert Cheng
+ *              April 2, 1998
  *
  *-------------------------------------------------------------------------
  */
@@ -500,21 +500,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_dxpl_mpio_collective_opt
+ * Function:    H5Pset_dxpl_mpio_collective_opt
  *
- * Purpose:	To set a flag to choose linked chunk I/O or multi-chunk I/O
- *		without involving decision-making inside HDF5
+ * Purpose:     To set a flag to choose linked chunk I/O or multi-chunk I/O
+ *              without involving decision-making inside HDF5
  *
- * Note:	The library will do linked chunk I/O or multi-chunk I/O without
- *		involving communications for decision-making process.
- *		The library won't behave as it asks for only when we find
- *		that the low-level MPI-IO package doesn't support this.
+ * Note:        The library will do linked chunk I/O or multi-chunk I/O without
+ *              involving communications for decision-making process.
+ *              The library won't behave as it asks for only when we find
+ *              that the low-level MPI-IO package doesn't support this.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -543,21 +542,20 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_dxpl_mpio_chunk_opt
+ * Function:    H5Pset_dxpl_mpio_chunk_opt
  *
- * Purpose:	To set a flag to choose linked chunk I/O or multi-chunk I/O
- *		without involving decision-making inside HDF5
+ * Purpose:     To set a flag to choose linked chunk I/O or multi-chunk I/O
+ *              without involving decision-making inside HDF5
  *
- * Note:	The library will do linked chunk I/O or multi-chunk I/O without
- *		involving communications for decision-making process.
- *		The library won't behave as it asks for only when we find
- *		that the low-level MPI-IO package doesn't support this.
+ * Note:        The library will do linked chunk I/O or multi-chunk I/O without
+ *              involving communications for decision-making process.
+ *              The library won't behave as it asks for only when we find
+ *              that the low-level MPI-IO package doesn't support this.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -586,19 +584,18 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_dxpl_mpio_chunk_opt_num
+ * Function:    H5Pset_dxpl_mpio_chunk_opt_num
  *
- * Purpose:	To set a threshold for doing linked chunk IO
+ * Purpose:     To set a threshold for doing linked chunk IO
  *
- * Note:	If the number is greater than the threshold set by the user,
- *		the library will do linked chunk I/O; otherwise, I/O will be
- *		done for every chunk.
+ * Note:        If the number is greater than the threshold set by the user,
+ *              the library will do linked chunk I/O; otherwise, I/O will be
+ *              done for every chunk.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -627,22 +624,21 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Pset_dxpl_mpio_chunk_opt_ratio
+ * Function:    H5Pset_dxpl_mpio_chunk_opt_ratio
  *
- * Purpose:	To set a threshold for doing collective I/O for each chunk
+ * Purpose:     To set a threshold for doing collective I/O for each chunk
  *
- * Note:	The library will calculate the percentage of the number of
- *		process holding selections at each chunk. If that percentage
- *		of number of process in the individual chunk is greater than
- *		the threshold set by the user, the library will do collective
- *		chunk I/O for this chunk; otherwise, independent I/O will be
- *		done for this chunk.
+ * Note:        The library will calculate the percentage of the number of
+ *              process holding selections at each chunk. If that percentage
+ *              of number of process in the individual chunk is greater than
+ *              the threshold set by the user, the library will do collective
+ *              chunk I/O for this chunk; otherwise, independent I/O will be
+ *              done for this chunk.
  *
- * Return:	Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      Success:    Non-negative
+ *              Failure:    Negative
  *
- * Programmer:	Kent Yang
- *		? ?, ?
+ * Programmer:  Kent Yang
  *
  *-------------------------------------------------------------------------
  */
@@ -671,16 +667,16 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_fapl_get
+ * Function:    H5FD__mpio_fapl_get
  *
- * Purpose:	Returns a file access property list which could be used to
- *		create another file the same as this one.
+ * Purpose:     Returns a file access property list which could be used to
+ *              create another file the same as this one.
  *
- * Return:	Success:	Ptr to new file access property list with all
- *				fields copied from the file pointer.
- *		Failure:	NULL
+ * Return:      Success:    Ptr to new file access property list with all
+ *                          fields copied from the file pointer.
+ *              Failure:    NULL
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Friday, August 13, 1999
  *
  *-------------------------------------------------------------------------
@@ -688,9 +684,9 @@ done:
 static void *
 H5FD__mpio_fapl_get(H5FD_t *_file)
 {
-    H5FD_mpio_t		*file = (H5FD_mpio_t*)_file;
-    H5FD_mpio_fapl_t	*fa = NULL;
-    void      *ret_value;       /* Return value */
+    H5FD_mpio_t         *file = (H5FD_mpio_t*)_file;
+    H5FD_mpio_fapl_t    *fa = NULL;
+    void                *ret_value = NULL;       /* Return value */
 
     FUNC_ENTER_STATIC
 
@@ -701,28 +697,38 @@ H5FD__mpio_fapl_get(H5FD_t *_file)
     /* Check arguments */
     if(NULL == (fa = (H5FD_mpio_fapl_t *)H5MM_calloc(sizeof(H5FD_mpio_fapl_t))))
         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    fa->comm = MPI_COMM_NULL;
+    fa->info = MPI_INFO_NULL;
 
-    /* Duplicate communicator and Info object. */
-    if(FAIL == H5FD_mpi_comm_info_dup(file->comm, file->info, &fa->comm, &fa->info))
-	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
+    /* Duplicate MPI communicator and info */
+    if(FAIL == H5_mpi_comm_dup(file->comm, &fa->comm))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "communicator duplicate failed")
+    if(FAIL == H5_mpi_info_dup(file->info, &fa->info))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "info duplicate failed")
 
     /* Set return value */
     ret_value = fa;
 
 done:
+    /* Clean up badness if we're failing */
+    if(NULL == ret_value && fa) {
+        H5_mpi_comm_free(&fa->comm);
+        H5_mpi_info_free(&fa->info);
+        H5MM_xfree(fa);
+    }
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FD__mpio_fapl_get() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_fapl_copy
+ * Function:    H5FD__mpio_fapl_copy
  *
- * Purpose:	Copies the mpio-specific file access properties.
+ * Purpose:     Copies the mpio-specific file access properties.
  *
- * Return:	Success:	Ptr to a new property list
- *		Failure:	NULL
+ * Return:      Success:    Ptr to a new property list
+ *              Failure:    NULL
  *
- * Programmer:	Albert Cheng
+ * Programmer:  Albert Cheng
  *              Jan  8, 2003
  *
  *-------------------------------------------------------------------------
@@ -730,9 +736,9 @@ done:
 static void *
 H5FD__mpio_fapl_copy(const void *_old_fa)
 {
-    const H5FD_mpio_fapl_t *old_fa = (const H5FD_mpio_fapl_t*)_old_fa;
-    H5FD_mpio_fapl_t	*new_fa = NULL;
-    void		*ret_value = NULL;
+    const H5FD_mpio_fapl_t  *old_fa = (const H5FD_mpio_fapl_t*)_old_fa;
+    H5FD_mpio_fapl_t        *new_fa = NULL;
+    void                    *ret_value = NULL;
 
     FUNC_ENTER_STATIC
 
@@ -747,18 +753,22 @@ if(H5FD_mpio_Debug[(int)'t'])
     /* Copy the general information */
     H5MM_memcpy(new_fa, old_fa, sizeof(H5FD_mpio_fapl_t));
 
-    /* Duplicate communicator and Info object. */
-    if(H5FD_mpi_comm_info_dup(old_fa->comm, old_fa->info, &new_fa->comm, &new_fa->info) < 0)
-	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
+    /* Duplicate MPI communicator and info */
+    if(H5_mpi_comm_dup(old_fa->comm, &new_fa->comm) < 0)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "communicator duplicate failed")
+    if(H5_mpi_info_dup(old_fa->info, &new_fa->info) < 0)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "info duplicate failed")
 
     /* Set return value */
     ret_value = new_fa;
 
 done:
-    if(NULL == ret_value)
-	/* cleanup */
-	if(new_fa)
-	    H5MM_xfree(new_fa);
+    /* Clean up badness if we're failing */
+    if(NULL == ret_value && new_fa) {
+        H5_mpi_comm_free(&new_fa->comm);
+        H5_mpi_info_free(&new_fa->info);
+        H5MM_xfree(new_fa);
+    }
 
 #ifdef H5FDmpio_DEBUG
 if(H5FD_mpio_Debug[(int)'t'])
@@ -770,14 +780,13 @@ if(H5FD_mpio_Debug[(int)'t'])
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_fapl_free
+ * Function:    H5FD__mpio_fapl_free
  *
- * Purpose:	Frees the mpio-specific file access properties.
+ * Purpose:     Frees the mpio-specific file access properties.
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Albert Cheng
+ * Programmer:  Albert Cheng
  *              Jan  8, 2003
  *
  *-------------------------------------------------------------------------
@@ -785,10 +794,9 @@ if(H5FD_mpio_Debug[(int)'t'])
 static herr_t
 H5FD__mpio_fapl_free(void *_fa)
 {
-    H5FD_mpio_fapl_t	*fa = (H5FD_mpio_fapl_t*)_fa;
-    herr_t		ret_value = SUCCEED;
+    H5FD_mpio_fapl_t    *fa = (H5FD_mpio_fapl_t*)_fa;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
 #ifdef H5FDmpio_DEBUG
 if(H5FD_mpio_Debug[(int)'t'])
@@ -800,7 +808,8 @@ if(H5FD_mpio_Debug[(int)'t'])
 
     /* Free the internal communicator and INFO object */
     HDassert(MPI_COMM_NULL != fa->comm);
-    H5FD_mpi_comm_info_free(&fa->comm, &fa->info);
+    H5_mpi_comm_free(&fa->comm);
+    H5_mpi_info_free(&fa->info);
     H5MM_xfree(fa);
 
 #ifdef H5FDmpio_DEBUG
@@ -808,21 +817,19 @@ if(H5FD_mpio_Debug[(int)'t'])
     HDfprintf(stderr, "%s: leaving\n", FUNC);
 #endif
 
-    FUNC_LEAVE_NOAPI(ret_value)
+    FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FD__mpio_fapl_free() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_set_mpio_atomicity
- *
- * Purpose:	Sets the atomicity mode
+ * Function:    H5FD_set_mpio_atomicity
  *
- * Return:	Success:	Non-negative
+ * Purpose:     Sets the atomicity mode
  *
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
@@ -838,7 +845,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     if(FALSE == flag)
@@ -853,7 +860,7 @@ H5FD_set_mpio_atomicity(H5FD_t *_file, hbool_t flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Leaving\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -861,16 +868,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD_get_mpio_atomicity
- *
- * Purpose:	Returns the atomicity mode
+ * Function:    H5FD_get_mpio_atomicity
  *
- * Return:	Success:	Non-negative
+ * Purpose:     Returns the atomicity mode
  *
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
@@ -886,7 +891,7 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Get atomicity value */
@@ -901,7 +906,7 @@ H5FD_get_mpio_atomicity(H5FD_t *_file, hbool_t *flag)
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Leaving\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -912,14 +917,14 @@ done:
  * Function:    H5FD__mpio_open
  *
  * Purpose:     Opens a file with name NAME.  The FLAGS are a bit field with
- *		purpose similar to the second argument of open(2) and which
- *		are defined in H5Fpublic.h. The file access property list
- *		FAPL_ID contains the properties driver properties and MAXADDR
- *		is the largest address which this file will be expected to
- *		access.  This is collective.
+ *              purpose similar to the second argument of open(2) and which
+ *              are defined in H5Fpublic.h. The file access property list
+ *              FAPL_ID contains the properties driver properties and MAXADDR
+ *              is the largest address which this file will be expected to
+ *              access.  This is collective.
  *
- * Return:      Success:        A new file pointer.
- *              Failure:        NULL
+ * Return:      Success:    A new file pointer
+ *              Failure:    NULL
  *
  * Programmer:  Robert Kim Yates
  *              January 30, 1998
@@ -943,30 +948,32 @@ H5FD__mpio_open(const char *name, unsigned flags, hid_t fapl_id,
     H5P_genplist_t *plist;      /* Property list pointer */
     MPI_Comm                    comm_dup = MPI_COMM_NULL;
     MPI_Info                    info_dup = MPI_INFO_NULL;
-    H5FD_t			*ret_value;     /* Return value */
+    H5FD_t			*ret_value = NULL;     /* Return value */
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering - name = \"%s\", flags = 0x%x, fapl_id = %d, maxaddr = %lu\n", FUNC, name, flags, (int)fapl_id, (unsigned long)maxaddr);
+        HDfprintf(stdout, "%s: Entering - name = \"%s\", flags = 0x%x, fapl_id = %d, maxaddr = %lu\n", FUNC, name, flags, (int)fapl_id, (unsigned long)maxaddr);
 #endif
 
     /* Obtain a pointer to mpio-specific file access properties */
     if(NULL == (plist = H5P_object_verify(fapl_id, H5P_FILE_ACCESS)))
         HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, NULL, "not a file access property list")
     if(H5P_FILE_ACCESS_DEFAULT == fapl_id || H5FD_MPIO != H5P_peek_driver(plist)) {
-	_fa.comm = MPI_COMM_SELF; /*default*/
-	_fa.info = MPI_INFO_NULL; /*default*/
-	fa = &_fa;
+        _fa.comm = MPI_COMM_SELF; /*default*/
+        _fa.info = MPI_INFO_NULL; /*default*/
+        fa = &_fa;
     } /* end if */
     else
         if(NULL == (fa = (const H5FD_mpio_fapl_t *)H5P_peek_driver_info(plist)))
-	    HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
+            HGOTO_ERROR(H5E_PLIST, H5E_BADVALUE, NULL, "bad VFL driver info")
 
-    /* Duplicate communicator and Info object for use by this file. */
-    if(FAIL == H5FD_mpi_comm_info_dup(fa->comm, fa->info, &comm_dup, &info_dup))
-	HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "Communicator/Info duplicate failed")
+    /* Duplicate MPI communicator and info */
+    if(FAIL == H5_mpi_comm_dup(fa->comm, &comm_dup))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "communicator duplicate failed")
+    if(FAIL == H5_mpi_info_dup(fa->info, &info_dup))
+        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTCOPY, NULL, "info duplicate failed")
 
     /* convert HDF5 flags to MPI-IO flags */
     /* some combinations are illegal; let MPI-IO figure it out */
@@ -1046,12 +1053,10 @@ done:
     if(ret_value == NULL) {
         if(file_opened)
             MPI_File_close(&fh);
-	if(MPI_COMM_NULL != comm_dup)
-	    MPI_Comm_free(&comm_dup);
-	if(MPI_INFO_NULL != info_dup)
-	    MPI_Info_free(&info_dup);
-	if(file)
-	    H5MM_xfree(file);
+        MPI_Comm_free(&comm_dup);
+        MPI_Info_free(&info_dup);
+        if(file)
+            H5MM_xfree(file);
     } /* end if */
 
 #ifdef H5FDmpio_DEBUG
@@ -1068,8 +1073,7 @@ done:
  *
  * Purpose:     Closes a file.  This is collective.
  *
- * Return:      Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Unknown
  *              January 30, 1998
@@ -1079,15 +1083,15 @@ done:
 static herr_t
 H5FD__mpio_close(H5FD_t *_file)
 {
-    H5FD_mpio_t	*file = (H5FD_mpio_t*)_file;
-    int		mpi_code;	        /* MPI return code */
+    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
+    int         mpi_code;               /* MPI return code */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Sanity checks */
@@ -1099,13 +1103,14 @@ H5FD__mpio_close(H5FD_t *_file)
         HMPI_GOTO_ERROR(FAIL, "MPI_File_close failed", mpi_code)
 
     /* Clean up other stuff */
-    H5FD_mpi_comm_info_free(&file->comm, &file->info);
+    H5_mpi_comm_free(&file->comm);
+    H5_mpi_info_free(&file->info);
     H5MM_xfree(file);
 
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Leaving\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1113,15 +1118,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_query
+ * Function:    H5FD__mpio_query
  *
- * Purpose:	Set the flags that this VFL driver is capable of supporting.
+ * Purpose:     Set the flags that this VFL driver is capable of supporting.
  *              (listed in H5FDpublic.h)
  *
- * Return:	Success:	non-negative
- *		Failure:	negative
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Friday, August 25, 2000
  *
  *-------------------------------------------------------------------------
@@ -1129,7 +1133,7 @@ done:
 static herr_t
 H5FD__mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out */)
 {
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Set the VFL feature flags that this driver supports */
     if(flags) {
@@ -1146,16 +1150,16 @@ H5FD__mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_get_eoa
+ * Function:    H5FD__mpio_get_eoa
  *
- * Purpose:	Gets the end-of-address marker for the file. The EOA marker
- *		is the first address past the last byte allocated in the
- *		format address space.
+ * Purpose:     Gets the end-of-address marker for the file. The EOA marker
+ *              is the first address past the last byte allocated in the
+ *              format address space.
  *
- * Return:	Success:	The end-of-address marker.
- *		Failure:	HADDR_UNDEF
+ * Return:      Success:    The end-of-address marker
+ *              Failure:    HADDR_UNDEF
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Friday, August  6, 1999
  *
  *-------------------------------------------------------------------------
@@ -1163,9 +1167,9 @@ H5FD__mpio_query(const H5FD_t H5_ATTR_UNUSED *_file, unsigned long *flags /* out
 static haddr_t
 H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_mpio_t	*file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity checks */
     HDassert(file);
@@ -1176,16 +1180,15 @@ H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_set_eoa
+ * Function:    H5FD__mpio_set_eoa
  *
- * Purpose:	Set the end-of-address marker for the file. This function is
- *		called shortly after an existing HDF5 file is opened in order
- *		to tell the driver where the end of the HDF5 data is located.
+ * Purpose:     Set the end-of-address marker for the file. This function is
+ *              called shortly after an existing HDF5 file is opened in order
+ *              to tell the driver where the end of the HDF5 data is located.
  *
- * Return:	Success:	0
- *		Failure:	-1
+ * Return:      SUCCEED/FAIL
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Friday, August 6, 1999
  *
  *-------------------------------------------------------------------------
@@ -1193,9 +1196,9 @@ H5FD__mpio_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 static herr_t
 H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 {
-    H5FD_mpio_t	*file = (H5FD_mpio_t*)_file;
+    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity checks */
     HDassert(file);
@@ -1208,27 +1211,27 @@ H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_get_eof
+ * Function:    H5FD__mpio_get_eof
  *
- * Purpose:	Gets the end-of-file marker for the file. The EOF marker
- *		is the real size of the file.
+ * Purpose:     Gets the end-of-file marker for the file. The EOF marker
+ *              is the real size of the file.
  *
- *		The MPIO driver doesn't bother keeping this field updated
- *		since that's a relatively expensive operation. Fortunately
- *		the library only needs the EOF just after the file is opened
- *		in order to determine whether the file is empty, truncated,
- *		or okay.  Therefore, any MPIO I/O function will set its value
- *		to HADDR_UNDEF which is the error return value of this
- *		function.
+ *              The MPIO driver doesn't bother keeping this field updated
+ *              since that's a relatively expensive operation. Fortunately
+ *              the library only needs the EOF just after the file is opened
+ *              in order to determine whether the file is empty, truncated,
+ *              or okay.  Therefore, any MPIO I/O function will set its value
+ *              to HADDR_UNDEF which is the error return value of this
+ *              function.
  *
  *              Keeping the EOF updated (during write calls) is expensive
  *              because any process may extend the physical end of the
  *              file. -QAK
  *
- * Return:	Success:	The end-of-address marker.
- *		Failure:	HADDR_UNDEF
+ * Return:      Success:    The end-of-file marker
+ *              Failure:    HADDR_UNDEF
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Friday, August  6, 1999
  *
  *-------------------------------------------------------------------------
@@ -1236,9 +1239,9 @@ H5FD__mpio_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
 static haddr_t
 H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
 {
-    const H5FD_mpio_t	*file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity checks */
     HDassert(file);
@@ -1253,7 +1256,7 @@ H5FD__mpio_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
  *
  * Purpose:        Returns the file handle of MPIO file driver.
  *
- * Returns:        Non-negative if succeed or negative if fails.
+ * Returns:        SUCCEED/FAIL
  *
  * Programmer:     Raymond Lu
  *                 Sept. 16, 2002
@@ -1283,13 +1286,11 @@ done:
  *
  * Purpose:        Returns the file info of MPIO file driver.
  *
- * Returns:        Non-negative if succeed or negative if fails.
+ * Returns:        SUCCEED/FAIL
  *
  * Programmer:     John Mainzer
  *                 April 4, 2017
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
 */
 static herr_t
@@ -1312,23 +1313,23 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_read
+ * Function:    H5FD__mpio_read
  *
- * Purpose:	Reads SIZE bytes of data from FILE beginning at address ADDR
- *		into buffer BUF according to data transfer properties in
- *		DXPL_ID using potentially complex file and buffer types to
- *		effect the transfer.
+ * Purpose:     Reads SIZE bytes of data from FILE beginning at address ADDR
+ *              into buffer BUF according to data transfer properties in
+ *              DXPL_ID using potentially complex file and buffer types to
+ *              effect the transfer.
  *
- *		Reading past the end of the MPI file returns zeros instead of
- *		failing.  MPI is able to coalesce requests from different
- *		processes (collective or independent).
+ *              Reading past the end of the MPI file returns zeros instead of
+ *              failing.  MPI is able to coalesce requests from different
+ *              processes (collective or independent).
  *
- * Return:	Success:	Zero. Result is stored in caller-supplied
- *				buffer BUF.
+ * Return:      Success:    SUCCEED. Result is stored in caller-supplied
+ *                          buffer BUF.
  *
- *		Failure:	-1, Contents of buffer BUF are undefined.
+ *              Failure:    FAIL. Contents of buffer BUF are undefined.
  *
- * Programmer:	rky, 1998-01-30
+ * Programmer:  rky, 1998-01-30
  *
  *-------------------------------------------------------------------------
  */
@@ -1531,22 +1532,22 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_write
+ * Function:    H5FD__mpio_write
  *
- * Purpose:	Writes SIZE bytes of data to FILE beginning at address ADDR
- *		from buffer BUF according to data transfer properties in
- *		DXPL_ID using potentially complex file and buffer types to
- *		effect the transfer.
+ * Purpose:     Writes SIZE bytes of data to FILE beginning at address ADDR
+ *              from buffer BUF according to data transfer properties in
+ *              DXPL_ID using potentially complex file and buffer types to
+ *              effect the transfer.
  *
- *		MPI is able to coalesce requests from different processes
- *		(collective and independent).
+ *              MPI is able to coalesce requests from different processes
+ *              (collective and independent).
  *
- * Return:	Success:	Zero. USE_TYPES and OLD_USE_TYPES in the
- *				access params are altered.
- *		Failure:	-1, USE_TYPES and OLD_USE_TYPES in the
- *				access params may be altered.
+ * Return:      Success:    SUCCEED. USE_TYPES and OLD_USE_TYPES in the
+ *                          access params are altered.
+ *              Failure:    FAIL. USE_TYPES and OLD_USE_TYPES in the
+ *                          access params may be altered.
  *
- * Programmer:	Robert Kim Yates
+ * Programmer:  Robert Kim Yates
  *              January 30, 1998
  *
  *-------------------------------------------------------------------------
@@ -1555,13 +1556,13 @@ static herr_t
 H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
     haddr_t addr, size_t size, const void *buf)
 {
-    H5FD_mpio_t			*file = (H5FD_mpio_t*)_file;
-    MPI_Offset 		 	mpi_off;
-    MPI_Status  		mpi_stat;       /* Status from I/O operation */
-    MPI_Datatype		buf_type = MPI_BYTE;      /* MPI description of the selection in memory */
-    int			        mpi_code;	/* MPI return code */
+    H5FD_mpio_t                 *file = (H5FD_mpio_t*)_file;
+    MPI_Offset                  mpi_off;
+    MPI_Status                  mpi_stat;       /* Status from I/O operation */
+    MPI_Datatype                buf_type = MPI_BYTE;      /* MPI description of the selection in memory */
+    int                         mpi_code;   /* MPI return code */
 #if MPI_VERSION >= 3
-    MPI_Count         		bytes_written;
+    MPI_Count                   bytes_written;
     MPI_Count                   type_size;      /* MPI datatype used for I/O's size */
     MPI_Count                   io_size;        /* Actual number of bytes requested */
 #else
@@ -1570,15 +1571,15 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
     int                         io_size;        /* Actual number of bytes requested */
 #endif
     int                         size_i;
-    hbool_t			use_view_this_time = FALSE;
+    hbool_t                     use_view_this_time = FALSE;
     H5FD_mpio_xfer_t            xfer_mode;   /* I/O transfer mode */
-    herr_t              	ret_value = SUCCEED;
+    herr_t                      ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Sanity checks */
@@ -1615,7 +1616,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
      * could mean "use MPI_BYTE" by convention).
      */
     if(xfer_mode == H5FD_MPIO_COLLECTIVE) {
-        MPI_Datatype		file_type;
+        MPI_Datatype    file_type;
 
         /* Remember that views are used */
         use_view_this_time = TRUE;
@@ -1713,7 +1714,7 @@ H5FD__mpio_write(H5FD_t *_file, H5FD_mem_t type, hid_t H5_ATTR_UNUSED dxpl_id,
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", FUNC, file->mpi_rank, ret_value );
+        HDfprintf(stdout, "%s: Leaving, proc %d: ret_value = %d\n", FUNC, file->mpi_rank, ret_value );
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1725,9 +1726,7 @@ done:
  *
  * Purpose:     Makes sure that all data is on disk.  This is collective.
  *
- * Return:      Success:	Non-negative
- *
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Robb Matzke
  *              January 30, 1998
@@ -1737,15 +1736,15 @@ done:
 static herr_t
 H5FD__mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 {
-    H5FD_mpio_t		*file = (H5FD_mpio_t*)_file;
-    int			mpi_code;	/* mpi return code */
-    herr_t              ret_value = SUCCEED;
+    H5FD_mpio_t     *file = (H5FD_mpio_t*)_file;
+    int             mpi_code;   /* mpi return code */
+    herr_t          ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Sanity checks */
@@ -1760,7 +1759,7 @@ H5FD__mpio_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Leaving\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1782,8 +1781,7 @@ done:
  *              only call MPI_File_set_size() if this value disagrees 
  *              with the current eoa.
  *
- * Return:      Success:	Non-negative
- * 		Failure:	Negative
+ * Return:      SUCCEED/FAIL
  *
  * Programmer:  Quincey Koziol
  *              January 31, 2008
@@ -1793,14 +1791,14 @@ done:
 static herr_t
 H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR_UNUSED closing)
 {
-    H5FD_mpio_t	*file = (H5FD_mpio_t*)_file;
+    H5FD_mpio_t *file = (H5FD_mpio_t*)_file;
     herr_t      ret_value = SUCCEED;
 
     FUNC_ENTER_STATIC
 
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Entering\n", FUNC);
+        HDfprintf(stdout, "%s: Entering\n", FUNC);
 #endif
 
     /* Sanity checks */
@@ -1869,7 +1867,7 @@ H5FD__mpio_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t H5_ATTR
 done:
 #ifdef H5FDmpio_DEBUG
     if(H5FD_mpio_Debug[(int)'t'])
-    	HDfprintf(stdout, "%s: Leaving\n", FUNC);
+        HDfprintf(stdout, "%s: Leaving\n", FUNC);
 #endif
 
     FUNC_LEAVE_NOAPI(ret_value)
@@ -1877,14 +1875,14 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_mpi_rank
+ * Function:    H5FD__mpio_mpi_rank
  *
- * Purpose:	Returns the MPI rank for a process
+ * Purpose:     Returns the MPI rank for a process
  *
- * Return:	Success: non-negative
- *		Failure: negative
+ * Return:      Success: non-negative
+ *              Failure: negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Thursday, May 16, 2002
  *
  *-------------------------------------------------------------------------
@@ -1892,9 +1890,9 @@ done:
 static int
 H5FD__mpio_mpi_rank(const H5FD_t *_file)
 {
-    const H5FD_mpio_t	*file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity checks */
     HDassert(file);
@@ -1905,14 +1903,14 @@ H5FD__mpio_mpi_rank(const H5FD_t *_file)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_mpi_size
+ * Function:    H5FD__mpio_mpi_size
  *
- * Purpose:	Returns the number of MPI processes
+ * Purpose:     Returns the number of MPI processes
  *
- * Return:	Success: non-negative
- *		Failure: negative
+ * Return:      Success: non-negative
+ *              Failure: negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Thursday, May 16, 2002
  *
  *-------------------------------------------------------------------------
@@ -1920,9 +1918,9 @@ H5FD__mpio_mpi_rank(const H5FD_t *_file)
 static int
 H5FD__mpio_mpi_size(const H5FD_t *_file)
 {
-    const H5FD_mpio_t	*file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity checks */
     HDassert(file);
@@ -1933,15 +1931,14 @@ H5FD__mpio_mpi_size(const H5FD_t *_file)
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FD__mpio_communicator
- *
- * Purpose:	Returns the MPI communicator for the file.
+ * Function:    H5FD__mpio_communicator
  *
- * Return:	Success:	The communicator
+ * Purpose:     Returns the MPI communicator for the file.
  *
- *		Failure:	NULL
+ * Return:      Success:    The communicator
+ *              Failure:    Can't fail
  *
- * Programmer:	Robb Matzke
+ * Programmer:  Robb Matzke
  *              Monday, August  9, 1999
  *
  *-------------------------------------------------------------------------
@@ -1949,9 +1946,9 @@ H5FD__mpio_mpi_size(const H5FD_t *_file)
 static MPI_Comm
 H5FD__mpio_communicator(const H5FD_t *_file)
 {
-    const H5FD_mpio_t	*file = (const H5FD_mpio_t*)_file;
+    const H5FD_mpio_t   *file = (const H5FD_mpio_t*)_file;
 
-    FUNC_ENTER_STATIC
+    FUNC_ENTER_STATIC_NOERR
 
     /* Sanity checks */
     HDassert(file);
@@ -1971,8 +1968,6 @@ H5FD__mpio_communicator(const H5FD_t *_file)
  * Programmer:     John Mainzer
  *                 April 4, 2017
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
 */
 static herr_t
diff --git a/src/H5FDprivate.h b/src/H5FDprivate.h
index c79d676..0db66af 100644
--- a/src/H5FDprivate.h
+++ b/src/H5FDprivate.h
@@ -160,9 +160,6 @@ H5_DLL herr_t H5FD_set_paged_aggr(H5FD_t *file, hbool_t paged);
 /* General routines */
 H5_DLL haddr_t H5FD_mpi_MPIOff_to_haddr(MPI_Offset mpi_off);
 H5_DLL herr_t H5FD_mpi_haddr_to_MPIOff(haddr_t addr, MPI_Offset *mpi_off/*out*/);
-H5_DLL herr_t H5FD_mpi_comm_info_dup(MPI_Comm comm, MPI_Info info,
-				MPI_Comm *comm_new, MPI_Info *info_new);
-H5_DLL herr_t H5FD_mpi_comm_info_free(MPI_Comm *comm, MPI_Info *info);
 #ifdef NOT_YET
 H5_DLL herr_t H5FD_mpio_wait_for_left_neighbor(H5FD_t *file);
 H5_DLL herr_t H5FD_mpio_signal_right_neighbor(H5FD_t *file);
diff --git a/src/H5Fmpi.c b/src/H5Fmpi.c
index 5bbd717..12bcbc0 100644
--- a/src/H5Fmpi.c
+++ b/src/H5Fmpi.c
@@ -90,14 +90,14 @@ herr_t
 H5F_get_mpi_handle(const H5F_t *f, MPI_File **f_handle)
 {
     herr_t ret_value = SUCCEED;
-    hid_t fapl = -1;
+    hid_t fapl_id = H5I_INVALID_HID;
 
     FUNC_ENTER_NOAPI(FAIL)
 
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value = H5FD_get_vfd_handle(f->shared->lf, fapl, (void **)f_handle)) < 0)
+    if ((ret_value = H5FD_get_vfd_handle(f->shared->lf, fapl_id, (void **)f_handle)) < 0)
         HGOTO_ERROR(H5E_FILE, H5E_CANTGET, FAIL, "can't get mpi file handle")
 
 done:
@@ -106,33 +106,31 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_mpi_get_rank
+ * Function:    H5F_mpi_get_rank
  *
- * Purpose:	Retrieves the rank of an MPI process.
+ * Purpose:     Retrieves the rank of an MPI process.
  *
- * Return:	Success:	The rank (non-negative)
+ * Return:      Success:    The rank (non-negative)
  *
- *		Failure:	Negative
+ *              Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Friday, January 30, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
 H5F_mpi_get_rank(const H5F_t *f)
 {
-    int	ret_value;
+    int ret_value = -1;
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI((-1))
 
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_rank(f->shared->lf)) < 0)
-        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_rank request failed")
+    if ((ret_value = H5FD_mpi_get_rank(f->shared->lf)) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, (-1), "driver get_rank request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -140,32 +138,30 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_mpi_get_comm
+ * Function:    H5F_mpi_get_comm
  *
- * Purpose:	Retrieves the file's communicator
+ * Purpose:     Retrieves the file's communicator
  *
- * Return:	Success:	The communicator (non-negative)
+ * Return:      Success:    The communicator (non-negative)
  *
- *		Failure:	Negative
+ *              Failure:    Negative
  *
- * Programmer:	Quincey Koziol
+ * Programmer:  Quincey Koziol
  *              Friday, January 30, 2004
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 MPI_Comm
 H5F_mpi_get_comm(const H5F_t *f)
 {
-    MPI_Comm	ret_value;
+    MPI_Comm    ret_value = MPI_COMM_NULL;
 
     FUNC_ENTER_NOAPI(MPI_COMM_NULL)
 
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_comm(f->shared->lf))==MPI_COMM_NULL)
+    if ((ret_value = H5FD_mpi_get_comm(f->shared->lf)) == MPI_COMM_NULL)
         HGOTO_ERROR(H5E_VFL, H5E_CANTGET, MPI_COMM_NULL, "driver get_comm request failed")
 
 done:
@@ -185,22 +181,20 @@ done:
  * Programmer:  John Mainzer
  *              Friday, May 6, 2005
  *
- * Modifications:
- *
  *-------------------------------------------------------------------------
  */
 int
 H5F_mpi_get_size(const H5F_t *f)
 {
-    int ret_value;
+    int ret_value = -1;
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_NOAPI((-1))
 
     HDassert(f && f->shared);
 
     /* Dispatch to driver */
-    if ((ret_value=H5FD_mpi_get_size(f->shared->lf)) < 0)
-        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, FAIL, "driver get_size request failed")
+    if ((ret_value = H5FD_mpi_get_size(f->shared->lf)) < 0)
+        HGOTO_ERROR(H5E_VFL, H5E_CANTGET, (-1), "driver get_size request failed")
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -208,16 +202,16 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Fset_mpi_atomicity
+ * Function:    H5Fset_mpi_atomicity
  *
- * Purpose:	Sets the atomicity mode
+ * Purpose:     Sets the atomicity mode
  *
- * Return:	Success:	Non-negative
+ * Return:      Success:    Non-negative
  *
- * 		Failure:	Negative
+ *              Failure:    Negative
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
@@ -248,16 +242,16 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5Fget_mpi_atomicity
+ * Function:    H5Fget_mpi_atomicity
  *
- * Purpose:	Returns the atomicity mode
+ * Purpose:     Returns the atomicity mode
  *
- * Return:	Success:	Non-negative
+ * Return:      Success:    Non-negative
  *
- * 		Failure:	Negative
+ *              Failure:    Negative
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
@@ -288,18 +282,18 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_mpi_retrieve_comm
+ * Function:    H5F_mpi_retrieve_comm
  *
- * Purpose:	Retrieves an MPI communicator from the file the location ID 
+ * Purpose:     Retrieves an MPI communicator from the file the location ID 
  *              is in. If the loc_id is invalid, the fapl_id is used to 
  *              retrieve the communicator.
  *
- * Return:	Success:	Non-negative
+ * Return:      Success:    Non-negative
  *
- * 		Failure:	Negative
+ *              Failure:    Negative
  *
- * Programmer:	Mohamad Chaarawi
- *		Feb 14, 2012
+ * Programmer:  Mohamad Chaarawi
+ *              Feb 14, 2012
  *
  *-------------------------------------------------------------------------
  */
diff --git a/src/H5mpi.c b/src/H5mpi.c
new file mode 100644
index 0000000..ea6b33f
--- /dev/null
+++ b/src/H5mpi.c
@@ -0,0 +1,198 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by The HDF Group.                                               *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the COPYING file, which can be found at the root of the source code       *
+ * distribution tree, or in https://support.hdfgroup.org/ftp/HDF5/releases.  *
+ * If you do not have access to either file, you may request a copy from     *
+ * help@hdfgroup.org.                                                        *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Purpose:     Common MPI routines
+ *
+ */
+
+
+#include "H5private.h"          /* Generic Functions                        */
+#include "H5CXprivate.h"        /* API Contexts                             */
+#include "H5Eprivate.h"         /* Error handling                           */
+#include "H5Fprivate.h"         /* File access                              */
+#include "H5FDprivate.h"        /* File drivers                             */
+#include "H5FDmpi.h"            /* Common MPI file driver                   */
+#include "H5Pprivate.h"         /* Property lists                           */
+
+#ifdef H5_HAVE_PARALLEL
+
+/*-------------------------------------------------------------------------
+ * Function:    H5_mpi_comm_dup
+ *
+ * Purpose:     Duplicate an MPI communicator.
+ *
+ *              The new communicator is returned via the comm_new pointer.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5_mpi_comm_dup(MPI_Comm comm, MPI_Comm *comm_new)
+{
+    herr_t      ret_value = SUCCEED;
+    MPI_Comm    comm_dup = MPI_COMM_NULL;
+    int         mpi_code;
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
+    if (!comm_new)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "comm_new cannot be NULL")
+    if (MPI_COMM_NULL == comm)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "can't duplicate MPI_COMM_NULL")
+
+    /* Duplicate the MPI communicator */
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_dup(comm, &comm_dup)))
+        HMPI_GOTO_ERROR(FAIL, "MPI_Comm_dup failed", mpi_code)
+
+    /* Set MPI_ERRORS_RETURN on comm_dup so that MPI failures are not fatal, 
+     * and return codes can be checked and handled.
+     */
+    if (MPI_SUCCESS != (mpi_code = MPI_Comm_set_errhandler(comm_dup, MPI_ERRORS_RETURN)))
+        HMPI_GOTO_ERROR(FAIL, "MPI_Errhandler_set failed", mpi_code)
+ 
+    /* Copy the new communicator to the return argument */
+    *comm_new = comm_dup;
+
+done:
+    if (FAIL == ret_value) {
+        /* need to free anything created here */
+        if (MPI_COMM_NULL != comm_dup)
+            MPI_Comm_free(&comm_dup);
+    }
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5_mpi_comm_dup() */ 
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5_mpi_info_dup
+ *
+ * Purpose:     Duplicate an MPI info.
+ *
+ *              If the info object is MPI_INFO_NULL, no duplicate
+ *              is made but the same value assigned to the new info object
+ *              handle.
+ *
+ *              The new info is returned via the info_new pointer.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5_mpi_info_dup(MPI_Info info, MPI_Info *info_new)
+{
+    herr_t      ret_value = SUCCEED;
+    MPI_Info    info_dup = MPI_INFO_NULL;
+    int         mpi_code;
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
+    if (!info_new)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "info_new cannot be NULL")
+
+    /* Duplicate the MPI info */
+    if (info == MPI_INFO_NULL) {
+        /* Don't duplicate MPI_INFO_NULL. Just copy it. */
+        info_dup = info;
+    }
+    else {
+        /* Duplicate the info */
+        if (MPI_SUCCESS != (mpi_code = MPI_Info_dup(info, &info_dup)))
+            HMPI_GOTO_ERROR(FAIL, "MPI_Info_dup failed", mpi_code)
+    }
+
+    /* Copy the new info to the return argument */
+    *info_new = info_dup;
+
+done:
+    if (FAIL == ret_value) {
+        /* need to free anything created here */
+        if (MPI_INFO_NULL != info_dup)
+            MPI_Info_free(&info_dup);
+    }
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5_mpi_info_dup() */ 
+
+
+/*-------------------------------------------------------------------------
+ * Function:    H5_mpi_comm_free
+ *
+ * Purpose:     Free an MPI communicator.
+ *
+ *              If comm is MPI_COMM_NULL this call does nothing.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5_mpi_comm_free(MPI_Comm *comm)
+{
+    herr_t      ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
+    if (!comm)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "comm pointer cannot be NULL")
+
+    /* Free the communicator */
+    if (MPI_COMM_NULL != *comm)
+        MPI_Comm_free(comm);
+
+    *comm = MPI_COMM_NULL;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* End H5_mpi_comm_free() */
+
+/*-------------------------------------------------------------------------
+ * Function:    H5_mpi_info_free
+ *
+ * Purpose:     Free the MPI info.
+ *
+ *              If info is MPI_INFO_NULL this call does nothing.
+ *
+ * Return:      SUCCEED/FAIL
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5_mpi_info_free(MPI_Info *info)
+{
+    herr_t      ret_value = SUCCEED;
+
+    FUNC_ENTER_NOAPI(FAIL)
+
+    /* Check arguments */
+    if (!info)
+        HGOTO_ERROR(H5E_INTERNAL, H5E_BADVALUE, FAIL, "info pointer cannot be NULL")
+
+    /* Free the info */
+    if (MPI_INFO_NULL != *info)
+        MPI_Info_free(info);
+
+    *info = MPI_INFO_NULL;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* End H5_mpi_info_free() */
+
+#endif /* H5_HAVE_PARALLEL */
+
diff --git a/src/H5private.h b/src/H5private.h
index 537e860..18b52a0 100644
--- a/src/H5private.h
+++ b/src/H5private.h
@@ -2668,6 +2668,14 @@ H5_DLL double H5_get_time(void);
 H5_DLL herr_t   H5_build_extpath(const char *name, char **extpath /*out*/);
 H5_DLL herr_t   H5_combine_path(const char *path1, const char *path2, char **full_name /*out*/);
 
+#ifdef H5_HAVE_PARALLEL
+/* Generic MPI functions */
+H5_DLL herr_t   H5_mpi_comm_dup(MPI_Comm comm, MPI_Comm *comm_new);
+H5_DLL herr_t   H5_mpi_info_dup(MPI_Info info, MPI_Info *info_new);
+H5_DLL herr_t   H5_mpi_comm_free(MPI_Comm *comm);
+H5_DLL herr_t   H5_mpi_info_free(MPI_Info *info);
+#endif /* H5_HAVE_PARALLEL */
+
 /* Functions for debugging */
 H5_DLL herr_t H5_buffer_dump(FILE *stream, int indent, const uint8_t *buf,
     const uint8_t *marker, size_t buf_offset, size_t buf_size);
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e6578e..1e1273c 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -126,7 +126,7 @@ libhdf5_la_SOURCES= H5.c H5checksum.c H5dbg.c H5system.c H5timer.c H5trace.c \
 
 # Only compile parallel sources if necessary
 if BUILD_PARALLEL_CONDITIONAL
-    libhdf5_la_SOURCES += H5ACmpio.c H5Cmpio.c H5Dmpio.c H5Fmpi.c H5FDmpi.c H5FDmpio.c H5Smpio.c
+    libhdf5_la_SOURCES += H5mpi.c H5ACmpio.c H5Cmpio.c H5Dmpio.c H5Fmpi.c H5FDmpi.c H5FDmpio.c H5Smpio.c
 endif
 
 # Only compile the direct VFD if necessary