Merge pull request #779 from edgargabriel/topic/fcoll_fixes

Topic/fcoll fixes

ompi/mca/fcoll/individual/fcoll_individual_file_read_all.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2011 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2015 University of Houston. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -38,6 +38,5 @@ mca_fcoll_individual_file_read_all (mca_io_ompio_file_t *fh,
                                     struct ompi_datatype_t *datatype,
                                     ompi_status_public_t *status)
 {
-    return fh->f_fh->f_io_selected_module.v2_0_0.
-	io_module_file_read( fh->f_fh, buf, count, datatype, status);
+    return ompio_io_ompio_file_read( fh, buf, count, datatype, status);
 }

ompi/mca/fcoll/individual/fcoll_individual_file_write_all.c

@@ -9,7 +9,7 @@
  *                         University of Stuttgart.  All rights reserved.
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
- * Copyright (c) 2008-2011 University of Houston. All rights reserved.
+ * Copyright (c) 2008-2015 University of Houston. All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -35,6 +35,5 @@ int mca_fcoll_individual_file_write_all (mca_io_ompio_file_t *fh,
                                          struct ompi_datatype_t *datatype,
                                          ompi_status_public_t *status)
 {
-    return fh->f_fh->f_io_selected_module.v2_0_0.
-	io_module_file_write (fh->f_fh, buf, count, datatype, status);
+    return ompio_io_ompio_file_write (fh, buf, count, datatype, status);
 }

ompi/mca/sharedfp/individual/sharedfp_individual_file_open.c

@@ -54,6 +54,7 @@ int mca_sharedfp_individual_file_open (struct ompi_communicator_t *comm,
         opal_output(0, "mca_sharedfp_individual_file_open: Error during file open\n");
         return err;
     }
+    shfileHandle->f_fh = fh->f_fh;
 
     sh = (struct mca_sharedfp_base_data_t*) malloc ( sizeof(struct mca_sharedfp_base_data_t));
     if ( NULL == sh ){

ompi/mca/sharedfp/lockedfile/sharedfp_lockedfile_file_open.c

@@ -10,6 +10,8 @@
  * Copyright (c) 2004-2005 The Regents of the University of California.
  *                         All rights reserved.
  * Copyright (c) 2013      University of Houston. All rights reserved.
+ * Copyright (c) 2015      Research Organization for Information Science
+ *                         and Technology (RIST). All rights reserved.
  * $COPYRIGHT$
  *
  * Additional copyrights may follow
@@ -53,6 +55,7 @@ int mca_sharedfp_lockedfile_file_open (struct ompi_communicator_t *comm,
         opal_output(0, "mca_sharedfp_lockedfile_file_open: Error during file open\n");
         return err;
     }
+    shfileHandle->f_fh = fh->f_fh;
 
     /*Memory is allocated here for the sh structure*/
     sh = (struct mca_sharedfp_base_data_t*)malloc(sizeof(struct mca_sharedfp_base_data_t));

ompi/mca/sharedfp/sm/sharedfp_sm_file_open.c

@@ -69,6 +69,7 @@ int mca_sharedfp_sm_file_open (struct ompi_communicator_t *comm,
         opal_output(0, "mca_sharedfp_sm_file_open: Error during file open\n");
         return err;
     }
+    shfileHandle->f_fh = fh->f_fh;
 
     /*Memory is allocated here for the sh structure*/
     if ( mca_sharedfp_sm_verbose ) {