Skip to content

Commit f31f4b2

Browse files
committed
fs/ufs: remove erroneous return statement
an erroneous return statement has creeped in commit 1885d99 which leads to some processes not resetting stripe_size and stripe_count correctly. This can lead in 3.0.x to different fcoll modules being selected. The impact is not that dramatic on master and 3.1.x, but could lead to problems as well. Fixes #4745 This is equivalen to commit 22a2b99 on master. I did not cherry pick, since they are some differences in the fs/lustre component and I did not want to introduce those changes in this commit. Signed-off-by: Edgar Gabriel <[email protected]>
1 parent 8d0f6b3 commit f31f4b2

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

ompi/mca/fs/ufs/fs_ufs_file_open.c

Lines changed: 1 addition & 2 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-2017 Research Organization for Information Science
1414
* and Technology (RIST). All rights reserved.
1515
* $COPYRIGHT$
@@ -156,7 +156,6 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,
156156
ret = MPI_ERR_OTHER;
157157
}
158158
}
159-
return ret;
160159
}
161160

162161
fh->f_stripe_size=0;

0 commit comments

Comments
 (0)