diff options
author | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-15 06:26:08 (GMT) |
---|---|---|
committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-08-15 06:26:08 (GMT) |
commit | 173083e1a5c9696be01bd983dd8c9bb87eb5a433 (patch) | |
tree | c8c4aa2dd961d18b48d0c734da3e16ea107e6c6f /src/H5MFsection.c | |
parent | ec7ca0dea2fba8071ce57e4f61d685c3e4d0d111 (diff) | |
download | hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.zip hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.tar.gz hdf5-173083e1a5c9696be01bd983dd8c9bb87eb5a433.tar.bz2 |
[svn-r17365] Description:
Final merge of changes from sblock_mdc branch back to trunk. The superblock is now managed by the metadata cache.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
FreeBSD/64 6.3 (liberty) w/C++ & FORTRAN, in debug mode
Linux/32 2.6 (kagiso) w/PGI compilers, w/C++ & FORTRAN, w/threadsafe,
in debug mode
Linux/64-amd64 2.6 (smirom) w/Intel compilers w/default API=1.6.x,
w/C++ & FORTRAN, in production mode
Solaris/32 2.10 (linew) w/deprecated symbols disabled, w/C++ & FORTRAN,
w/szip filter, in production mode
Linux/64-ia64 2.6 (cobalt) w/Intel compilers, w/C++ & FORTRAN,
in production mode
Linux/64-ia64 2.4 (tg-login3) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.5.8 (amazon) in debug mode
Mac OS X/32 10.5.8 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5MFsection.c')
-rw-r--r-- | src/H5MFsection.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/H5MFsection.c b/src/H5MFsection.c index 0dc43c3..d10b6b1 100644 --- a/src/H5MFsection.c +++ b/src/H5MFsection.c @@ -404,8 +404,11 @@ H5MF_sect_simple_shrink(H5FS_section_info_t **_sect, void *_udata) /* Check for shrinking file */ if(H5MF_SHRINK_EOA == udata->shrink) { + /* Sanity check */ + HDassert(H5F_INTENT(udata->f) & H5F_ACC_RDWR); + /* Release section's space at EOA with file driver */ - if(H5FD_free(udata->f->shared->lf, udata->dxpl_id, udata->alloc_type, (*sect)->sect_info.addr, (*sect)->sect_info.size) < 0) + if(H5FD_free(udata->f->shared->lf, udata->dxpl_id, udata->alloc_type, udata->f, (*sect)->sect_info.addr, (*sect)->sect_info.size) < 0) HGOTO_ERROR(H5E_RESOURCE, H5E_CANTFREE, FAIL, "driver free request failed") } /* end if */ else { |