diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2008-07-15 21:00:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2008-07-15 21:00:15 (GMT) |
| commit | 516c63299f638bf0f9ab6d58268e8edf28515ed4 (patch) | |
| tree | 2fa0ac337fd747bc96d131a0bc72429f32ed97e6 /src/H5Fmount.c | |
| parent | 1572fb46e083a6d44235c77638752777106e86d3 (diff) | |
| download | hdf5-516c63299f638bf0f9ab6d58268e8edf28515ed4.zip hdf5-516c63299f638bf0f9ab6d58268e8edf28515ed4.tar.gz hdf5-516c63299f638bf0f9ab6d58268e8edf28515ed4.tar.bz2 | |
[svn-r15367] Description:
Add check to avoid mounting the a file on a group twice, then the mounts
are done on the same HDF5 file, but opened with separate H5Fopen calls.
Also add new 'mounted' flag to the H5G_info_t struct, queried with the
H5Gget_info() API call, to allow applications to detect and avoid this
situation.
This probably fixes Bz#1070 also, I'll check with Dan Anov (who reported
a different sort of behavior, but seems to have the same underlying problem).
Tested on:
Mac OS X/32 10.5.4 (amazon)
Linux/64 2.6 (chicago)
Diffstat (limited to 'src/H5Fmount.c')
| -rw-r--r-- | src/H5Fmount.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c index 470d323..c96c920 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -135,7 +135,7 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, HDassert(child); HDassert(TRUE == H5P_isa_class(plist_id, H5P_FILE_MOUNT)); - /* Set up dataset location to fill in */ + /* Set up group location to fill in */ mp_loc.oloc = &mp_oloc; mp_loc.path = &mp_path; H5G_loc_reset(&mp_loc); @@ -161,6 +161,10 @@ H5F_mount(H5G_loc_t *loc, const char *name, H5F_t *child, if(NULL == (mount_point = H5G_open(&mp_loc, dxpl_id))) HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point not found") + /* Check if the proposed mount point group is already a mount point */ + if(H5G_MOUNTED(mount_point)) + HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "mount point is already in use") + /* Retrieve information from the mount point group */ /* (Some of which we had before but was reset in mp_loc when the group * "took over" the group location - QAK) |