fs/ufs: set proper error codes on file_open
set proper error codes in mca_fs_ufs_file_open by mapping the errno value to the MPI error code. Fixes an issue reported on the mailing by Wei-keng Liao Fixes Issue #4443 Signed-off-by: Edgar Gabriel <egabriel@central.uh.edu>
Этот коммит содержится в:
родитель
3e1f771045
Коммит
1885d99ac7
@ -157,7 +157,9 @@ int mca_common_ompio_file_open (ompi_communicator_t *comm,
|
||||
ompio_fh);
|
||||
|
||||
if ( OMPI_SUCCESS != ret ) {
|
||||
ret = MPI_ERR_FILE;
|
||||
#ifdef OMPIO_DEBUG
|
||||
opal_output(1, "fs_file failed, error code %d\n", ret);
|
||||
#endif
|
||||
goto fn_fail;
|
||||
}
|
||||
|
||||
|
@ -9,7 +9,7 @@
|
||||
* University of Stuttgart. All rights reserved.
|
||||
* Copyright (c) 2004-2005 The Regents of the University of California.
|
||||
* All rights reserved.
|
||||
* Copyright (c) 2008-2014 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2008-2017 University of Houston. All rights reserved.
|
||||
* Copyright (c) 2015 Research Organization for Information Science
|
||||
* and Technology (RIST). All rights reserved.
|
||||
* Copyright (c) 2016-2017 IBM Corporation. All rights reserved.
|
||||
@ -50,7 +50,7 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,
|
||||
{
|
||||
int amode;
|
||||
int old_mask, perm;
|
||||
int rank, ret;
|
||||
int rank, ret=OMPI_SUCCESS;
|
||||
|
||||
rank = ompi_comm_rank ( comm );
|
||||
|
||||
@ -72,6 +72,8 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,
|
||||
if (access_mode & MPI_MODE_RDWR)
|
||||
amode = amode | O_RDWR;
|
||||
|
||||
/* Reset errno */
|
||||
errno = 0;
|
||||
if ( 0 == rank ) {
|
||||
/* MODE_CREATE and MODE_EXCL can only be set by one process */
|
||||
if ( !(fh->f_flags & OMPIO_SHAREDFP_IS_SET)) {
|
||||
@ -81,19 +83,63 @@ mca_fs_ufs_file_open (struct ompi_communicator_t *comm,
|
||||
amode = amode | O_EXCL;
|
||||
}
|
||||
fh->fd = open (filename, amode, perm);
|
||||
ret = fh->fd;
|
||||
if ( 0 > fh->fd ) {
|
||||
if ( EACCES == errno ) {
|
||||
ret = MPI_ERR_ACCESS;
|
||||
}
|
||||
else if ( ENAMETOOLONG == errno ) {
|
||||
ret = MPI_ERR_BAD_FILE;
|
||||
}
|
||||
else if ( ENOENT == errno ) {
|
||||
ret = MPI_ERR_NO_SUCH_FILE;
|
||||
}
|
||||
else if ( EISDIR == errno ) {
|
||||
ret = MPI_ERR_BAD_FILE;
|
||||
}
|
||||
else if ( EROFS == errno ) {
|
||||
ret = MPI_ERR_READ_ONLY;
|
||||
}
|
||||
else if ( EEXIST == errno ) {
|
||||
ret = MPI_ERR_FILE_EXISTS;
|
||||
}
|
||||
else {
|
||||
ret = MPI_ERR_OTHER;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
comm->c_coll->coll_bcast ( &ret, 1, MPI_INT, 0, comm, comm->c_coll->coll_bcast_module);
|
||||
if ( -1 == ret ) {
|
||||
fh->fd = ret;
|
||||
return OMPI_ERROR;
|
||||
if ( OMPI_SUCCESS != ret ) {
|
||||
fh->fd = -1;
|
||||
return ret;
|
||||
}
|
||||
|
||||
if ( 0 != rank ) {
|
||||
fh->fd = open (filename, amode, perm);
|
||||
if (-1 == fh->fd) {
|
||||
return OMPI_ERROR;
|
||||
if ( 0 > fh->fd) {
|
||||
if ( EACCES == errno ) {
|
||||
ret = MPI_ERR_ACCESS;
|
||||
}
|
||||
else if ( ENAMETOOLONG == errno ) {
|
||||
ret = MPI_ERR_BAD_FILE;
|
||||
}
|
||||
else if ( ENOENT == errno ) {
|
||||
ret = MPI_ERR_NO_SUCH_FILE;
|
||||
}
|
||||
else if ( EISDIR == errno ) {
|
||||
ret = MPI_ERR_BAD_FILE;
|
||||
}
|
||||
else if ( EROFS == errno ) {
|
||||
ret = MPI_ERR_READ_ONLY;
|
||||
}
|
||||
else if ( EEXIST == errno ) {
|
||||
ret = MPI_ERR_FILE_EXISTS;
|
||||
}
|
||||
else {
|
||||
ret = MPI_ERR_OTHER;
|
||||
}
|
||||
}
|
||||
return ret;
|
||||
}
|
||||
|
||||
fh->f_stripe_size=0;
|
||||
|
Загрузка…
x
Ссылка в новой задаче
Block a user