Skip to content

Commit 851e099

Browse files
committed
the individual component should call internal ompio functions directly. The reason is that otherwise
the redirection to the ompi_file_t structure (and back to the ompio internal structure) is ambiguise and wrong for the shared file pointer scenario.
1 parent a4113cf commit 851e099

File tree

2 files changed

+4
-6
lines changed

2 files changed

+4
-6
lines changed

ompi/mca/fcoll/individual/fcoll_individual_file_read_all.c

Lines changed: 2 additions & 3 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-2011 University of Houston. All rights reserved.
12+
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
1313
* $COPYRIGHT$
1414
*
1515
* Additional copyrights may follow
@@ -38,6 +38,5 @@ mca_fcoll_individual_file_read_all (mca_io_ompio_file_t *fh,
3838
struct ompi_datatype_t *datatype,
3939
ompi_status_public_t *status)
4040
{
41-
return fh->f_fh->f_io_selected_module.v2_0_0.
42-
io_module_file_read( fh->f_fh, buf, count, datatype, status);
41+
return ompio_io_ompio_file_read( fh, buf, count, datatype, status);
4342
}

ompi/mca/fcoll/individual/fcoll_individual_file_write_all.c

Lines changed: 2 additions & 3 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-2011 University of Houston. All rights reserved.
12+
* Copyright (c) 2008-2015 University of Houston. All rights reserved.
1313
* $COPYRIGHT$
1414
*
1515
* Additional copyrights may follow
@@ -35,6 +35,5 @@ int mca_fcoll_individual_file_write_all (mca_io_ompio_file_t *fh,
3535
struct ompi_datatype_t *datatype,
3636
ompi_status_public_t *status)
3737
{
38-
return fh->f_fh->f_io_selected_module.v2_0_0.
39-
io_module_file_write (fh->f_fh, buf, count, datatype, status);
38+
return ompio_io_ompio_file_write (fh, buf, count, datatype, status);
4039
}

0 commit comments

Comments
 (0)