Merge pull request #4 from edgargabriel/pr/ompio_abstraction_minor_item

fs/pvfs2: fix compilation problem

Author: ggouaillardet

ompi/mca/fs/pvfs2/fs_pvfs2.h

@@ -46,6 +46,8 @@ extern int mca_fs_pvfs2_IS_INITIALIZED;
 
 BEGIN_C_DECLS
 
+#define OMPIO_PVFS2_MAX_NAME 100
+
 struct mca_fs_pvfs2_s {
     PVFS_credentials credentials;
     PVFS_object_ref object_ref;

ompi/mca/fs/pvfs2/fs_pvfs2_file_delete.c

@@ -45,7 +45,7 @@ mca_fs_pvfs2_file_delete (char* file_name,
     PVFS_sysresp_getparent resp_getparent;
     int ret;
     PVFS_fs_id pvfs2_id;
-    char pvfs2_path[OMPIO_MAX_NAME] = {0};
+    char pvfs2_path[OMPIO_PVFS2_MAX_NAME] = {0};
     char * ncache_timeout;
 
     if (!mca_fs_pvfs2_IS_INITIALIZED) {
@@ -64,7 +64,7 @@ mca_fs_pvfs2_file_delete (char* file_name,
     memset (&credentials, 0, sizeof(PVFS_credentials));
     PVFS_util_gen_credentials (&credentials);
 
-    ret = PVFS_util_resolve(file_name, &pvfs2_id, pvfs2_path, OMPIO_MAX_NAME);
+    ret = PVFS_util_resolve(file_name, &pvfs2_id, pvfs2_path, OMPIO_PVFS2_MAX_NAME);
     if (ret != 0) {
         return OMPI_ERROR;
     }

ompi/mca/fs/pvfs2/fs_pvfs2_file_open.c

@@ -67,7 +67,7 @@ mca_fs_pvfs2_file_open (struct ompi_communicator_t *comm,
     int ret;
     mca_fs_pvfs2 *pvfs2_fs;
     PVFS_fs_id pvfs2_id;
-    char pvfs2_path[OMPIO_MAX_NAME] = {0};
+    char pvfs2_path[OMPIO_PVFS2_MAX_NAME] = {0};
     char * ncache_timeout;
     open_status o_status = {0, {0, 0}};
     struct ompi_datatype_t *open_status_type;
@@ -129,7 +129,7 @@ mca_fs_pvfs2_file_open (struct ompi_communicator_t *comm,
 
 
     if (OMPIO_ROOT == fh->f_rank) {
-        ret = PVFS_util_resolve(filename, &pvfs2_id, pvfs2_path, OMPIO_MAX_NAME);
+        ret = PVFS_util_resolve(filename, &pvfs2_id, pvfs2_path, OMPIO_PVFS2_MAX_NAME);
         if (ret < 0 ) {
             PVFS_perror("PVFS_util_resolve", ret);
 	    o_status.error = -1;

ompi/mca/io/ompio/io_ompio.h

@@ -63,7 +63,6 @@ OMPI_DECLSPEC extern int mca_io_ompio_coll_timing_info;
  */
 #define OMPIO_PREALLOC_MAX_BUF_SIZE   33554432
 #define OMPIO_DEFAULT_CYCLE_BUF_SIZE  536870912
-#define OMPIO_MAX_NAME                100
 #define OMPIO_TAG_GATHER              -100
 #define OMPIO_TAG_GATHERV             -101
 #define OMPIO_TAG_BCAST               -102