Skip to content

Commit 2742273

Browse files
committed
common/ompio: fix an ordering problem during file_open
the sharedfp component has to be selected and opened before we set the default file view during file_open. Otherwise there is a sperious error message from the sharefp_file_seek operation that is called during the file_set_view. Fixes Issue #5560 Signed-off-by: Edgar Gabriel <[email protected]>
1 parent fc9218d commit 2742273

File tree

1 file changed

+11
-11
lines changed

1 file changed

+11
-11
lines changed

ompi/mca/common/ompio/common_ompio_file_open.c

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
* University of Stuttgart. All rights reserved.
1010
* Copyright (c) 2004-2005 The Regents of the University of California.
1111
* All rights reserved.
12-
* Copyright (c) 2008-2017 University of Houston. All rights reserved.
12+
* Copyright (c) 2008-2018 University of Houston. All rights reserved.
1313
* Copyright (c) 2015-2018 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* Copyright (c) 2016 Cisco Systems, Inc. All rights reserved.
@@ -164,15 +164,6 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
164164
goto fn_fail;
165165
}
166166

167-
/* Set default file view */
168-
mca_common_ompio_set_view(ompio_fh,
169-
0,
170-
&ompi_mpi_byte.dt,
171-
&ompi_mpi_byte.dt,
172-
"native",
173-
info);
174-
175-
176167
if ( true == use_sharedfp ) {
177168
/* open the file once more for the shared file pointer if required.
178169
** Can be disabled by the user if no shared file pointer operations
@@ -191,6 +182,15 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
191182
}
192183
}
193184

185+
/* Set default file view */
186+
mca_common_ompio_set_view(ompio_fh,
187+
0,
188+
&ompi_mpi_byte.dt,
189+
&ompi_mpi_byte.dt,
190+
"native",
191+
info);
192+
193+
194194

195195
/* If file has been opened in the append mode, move the internal
196196
file pointer of OMPIO to the very end of the file. */
@@ -506,7 +506,7 @@ int mca_common_ompio_file_delete (const char *filename,
506506
return ret;
507507
}
508508

509-
ret = fh->f_fs->fs_file_delete (filename, NULL);
509+
ret = fh->f_fs->fs_file_delete ( (char *)filename, NULL);
510510
free(fh);
511511

512512
if (OMPI_SUCCESS != ret) {

0 commit comments

Comments
 (0)