Fix: making sure the file type is not overwritten by the last queried component

This commit was SVN r30478.

ompi/mca/fs/lustre/fs_lustre.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-2014 University of Houston. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -140,11 +140,14 @@ int mca_fs_lustre_component_file_unquery (mca_io_ompio_file_t *file)
     * does not have anything to do since there are no steps which need 
     * to be undone if this module is not selected */
 
-   return OMPI_SUCCESS;
+    return OMPI_SUCCESS;
 }
 
 int mca_fs_lustre_module_init (mca_io_ompio_file_t *file)
 {
+    /* Make sure the file type is not overwritten by the last queried 
+	 * component */
+    file->f_fstype = LUSTRE;
     return OMPI_SUCCESS;
 }
 

ompi/mca/fs/plfs/fs_plfs.c

@@ -142,6 +142,9 @@ int mca_fs_plfs_component_file_unquery (mca_io_ompio_file_t *file)
 
 int mca_fs_plfs_module_init (mca_io_ompio_file_t *file)
 {
+    /* Make sure the file type is not overwritten by the last queried 
+	 * component */
+    file->f_fstype = PLFS;
     return OMPI_SUCCESS;
 }
 

ompi/mca/fs/pvfs2/fs_pvfs2.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-2014 University of Houston. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -145,6 +145,9 @@ int mca_fs_pvfs2_component_file_unquery (mca_io_ompio_file_t *file)
 
 int mca_fs_pvfs2_module_init (mca_io_ompio_file_t *file)
 {
+    /* Make sure the file type is not overwritten by the last queried 
+	 * component */
+    file->f_fstype = PVFS2;
     return OMPI_SUCCESS;
 }
 

ompi/mca/fs/ufs/fs_ufs.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-2014 University of Houston. All rights reserved.
  * $COPYRIGHT$
  * 
  * Additional copyrights may follow
@@ -83,6 +83,9 @@ int mca_fs_ufs_component_file_unquery (mca_io_ompio_file_t *file)
 
 int mca_fs_ufs_module_init (mca_io_ompio_file_t *file)
 {
+    /* Make sure the file type is not overwritten by the last queried 
+	 * component */
+    file->f_fstype = UFS;
     return OMPI_SUCCESS;
 }