diff options
| author | Quincey Koziol <koziol@lbl.gov> | 2020-08-07 15:06:34 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@lbl.gov> | 2020-08-07 15:06:34 (GMT) |
| commit | a2340cec3b1ff84e991b4e8d54a5e358a38831fe (patch) | |
| tree | bb49b22a1ea2e6edf8a379c4e13438d170937696 /src/H5FDsplitter.c | |
| parent | 8fe3cece3c671453e4c49f22fde9d7635c08f031 (diff) | |
| parent | 51ab52ad4298913d18d1f8c3be7e2c2a410c58a8 (diff) | |
| download | hdf5-a2340cec3b1ff84e991b4e8d54a5e358a38831fe.zip hdf5-a2340cec3b1ff84e991b4e8d54a5e358a38831fe.tar.gz hdf5-a2340cec3b1ff84e991b4e8d54a5e358a38831fe.tar.bz2 | |
Merge remote-tracking branch 'origin/develop' into namespace_cleanup_01
Diffstat (limited to 'src/H5FDsplitter.c')
| -rw-r--r-- | src/H5FDsplitter.c | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/H5FDsplitter.c b/src/H5FDsplitter.c index 18a8735..d0ed250d 100644 --- a/src/H5FDsplitter.c +++ b/src/H5FDsplitter.c @@ -1121,10 +1121,11 @@ H5FD__splitter_lock(H5FD_t *_file, hbool_t rw) /* Place the lock on each file */ if(H5FD_lock(file->rw_file, rw) < 0) - HGOTO_ERROR(H5E_VFL, H5E_CANTLOCK, FAIL, "unable to lock R/W file") + HGOTO_ERROR(H5E_VFL, H5E_CANTLOCKFILE, FAIL, "unable to lock R/W file") + if(file->wo_file != NULL) if(H5FD_lock(file->wo_file, rw) < 0) - H5FD_SPLITTER_WO_ERROR(file, FUNC, H5E_VFL, H5E_CANTLOCK, FAIL, "unable to lock W/O file") + H5FD_SPLITTER_WO_ERROR(file, FUNC, H5E_VFL, H5E_CANTLOCKFILE, FAIL, "unable to lock W/O file") done: FUNC_LEAVE_NOAPI(ret_value) @@ -1155,10 +1156,11 @@ H5FD__splitter_unlock(H5FD_t *_file) /* Remove the lock on each file */ if(H5FD_unlock(file->rw_file) < 0) - HGOTO_ERROR(H5E_VFL, H5E_CANTUNLOCK, FAIL, "unable to unlock R/W file") + HGOTO_ERROR(H5E_VFL, H5E_CANTUNLOCKFILE, FAIL, "unable to unlock R/W file") + if(file->wo_file != NULL) if(H5FD_unlock(file->wo_file) < 0) - HGOTO_ERROR(H5E_VFL, H5E_CANTUNLOCK, FAIL, "unable to unlock W/O file") + HGOTO_ERROR(H5E_VFL, H5E_CANTUNLOCKFILE, FAIL, "unable to unlock W/O file") done: FUNC_LEAVE_NOAPI(ret_value) |