Merge pull request open-mpi#7047 from edgargabriel/pr/v4.0.x-hdf5-2gb-bug

gpaulsen · web-flow · commit dbb873f46ffe · 2019-11-01T14:06:46.000-05:00
comomn_ompio_file_read/write: fix 2GB limiting issue
diff --git a/ompi/mca/common/ompio/common_ompio.h b/ompi/mca/common/ompio/common_ompio.h
@@ -261,7 +261,7 @@ OMPI_DECLSPEC int mca_common_ompio_file_iwrite_at_all (ompio_file_t *fp, OMPI_MP
                                                        int count, struct ompi_datatype_t *datatype, ompi_request_t **request);
 
 OMPI_DECLSPEC int mca_common_ompio_build_io_array ( ompio_file_t *fh, int index, int cycles,
-                                                    size_t bytes_per_cycle, int max_data, uint32_t iov_count,
+                                                    size_t bytes_per_cycle, size_t max_data, uint32_t iov_count,
                                                     struct iovec *decoded_iov, int *ii, int *jj, size_t *tbw,
                                                     size_t *spc );
 
diff --git a/ompi/mca/common/ompio/common_ompio_file_read.c b/ompi/mca/common/ompio/common_ompio_file_read.c
@@ -429,8 +429,8 @@ int mca_common_ompio_file_iread_at_all (ompio_file_t *fp,
 int mca_common_ompio_set_explicit_offset (ompio_file_t *fh,
                                           OMPI_MPI_OFFSET_TYPE offset)
 {
-    int i = 0;
-    int k = 0;
+    size_t i = 0;
+    size_t k = 0;
 
     if ( fh->f_view_size  > 0 ) {
 	/* starting offset of the current copy of the filew view */
diff --git a/ompi/mca/common/ompio/common_ompio_file_write.c b/ompi/mca/common/ompio/common_ompio_file_write.c
@@ -409,7 +409,7 @@ int mca_common_ompio_file_iwrite_at_all (ompio_file_t *fp,
 /**************************************************************/
 
 int mca_common_ompio_build_io_array ( ompio_file_t *fh, int index, int cycles,
-                                      size_t bytes_per_cycle, int  max_data, uint32_t iov_count,
+                                      size_t bytes_per_cycle, size_t  max_data, uint32_t iov_count,
                                       struct iovec *decoded_iov, int *ii, int *jj, size_t *tbw, 
                                       size_t *spc)
 {

Original file line number	Diff line number	Diff line change
`@@ -409,7 +409,7 @@ int mca_common_ompio_file_iwrite_at_all (ompio_file_t *fp,`
`409`	`409`	`/**************************************************************/`
`410`	`410`
`411`	`411`	`int mca_common_ompio_build_io_array ( ompio_file_t *fh, int index, int cycles,`
`412`		`- size_t bytes_per_cycle, int max_data, uint32_t iov_count,`
	`412`	`+ size_t bytes_per_cycle, size_t max_data, uint32_t iov_count,`
`413`	`413`	`struct iovec decoded_iov, int ii, int jj, size_t tbw,`
`414`	`414`	`size_t *spc)`
`415`	`415`	`{`