make the selection logic for the directio component work.

Author: edgargabriel

ompi/mca/fbtl/directio/fbtl_directio.c

@@ -62,13 +62,16 @@ int mca_fbtl_directio_component_init_query(bool enable_progress_threads,
 
 struct mca_fbtl_base_module_1_0_0_t *
 mca_fbtl_directio_component_file_query (mca_io_ompio_file_t *fh, int *priority) {
-   *priority = mca_fbtl_directio_priority;
+    int fd_direct;
+    *priority = mca_fbtl_directio_priority;
 
-   if ( 0 != fh->f_fs_ptr   && 
-        PVFS2 != fh->f_fstype) {
-   }
+    memcpy (&fd_direct, &fh->f_fs_ptr, sizeof(int) );
+    if ( 0 < fd_direct        && 
+         PVFS2 != fh->f_fstype) {
+        *priority = 100;
+    }
 
-   return &directio;
+    return &directio;
 }
 
 int mca_fbtl_directio_component_file_unquery (mca_io_ompio_file_t *file) {

ompi/mca/io/ompio/io_ompio_file_open.c

@@ -169,6 +169,22 @@ ompio_io_ompio_file_open (ompi_communicator_t *comm,
         opal_output(1, "mca_fs_base_file_select() failed\n");
         goto fn_fail;
     }
+
+    ret = ompio_fh->f_fs->fs_file_open (comm,
+					filename,
+					amode,
+					info,
+					ompio_fh);
+
+
+
+
+    if ( OMPI_SUCCESS != ret ) {
+	ret = MPI_ERR_FILE;
+        goto fn_fail;
+    }
+
+
     if (OMPI_SUCCESS != (ret = mca_fbtl_base_file_select (ompio_fh,
                                                           NULL))) {
         opal_output(1, "mca_fbtl_base_file_select() failed\n");
@@ -231,19 +247,6 @@ ompio_io_ompio_file_open (ompi_communicator_t *comm,
 	}
     }
 
-    ret = ompio_fh->f_fs->fs_file_open (comm,
-					filename,
-					amode,
-					info,
-					ompio_fh);
-
-
-
-
-    if ( OMPI_SUCCESS != ret ) {
-	ret = MPI_ERR_FILE;
-        goto fn_fail;
-    }
 
 
     /* If file has been opened in the append mode, move the internal