diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 02:48:15 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 02:48:15 (GMT) |
| commit | 5d8a2cca07e42684a323f0f007149f549bdbf307 (patch) | |
| tree | 6d04c84977990ab0f332203e2703bf4235fbd902 /src/H5HFiblock.c | |
| parent | ec7f4dc603484d18cde1af79c2906c68cec1ad3b (diff) | |
| download | hdf5-5d8a2cca07e42684a323f0f007149f549bdbf307.zip hdf5-5d8a2cca07e42684a323f0f007149f549bdbf307.tar.gz hdf5-5d8a2cca07e42684a323f0f007149f549bdbf307.tar.bz2 | |
[svn-r18740] Description:
Bring r18738 from metadata journaling 'merging' branch to trunk:
Switch H5AC_resize_pinned_entry() to work on protected entries as well,
and rename to H5AC_resize_entry()
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 (jam) w/PGI compilers, w/default API=1.8.x,
w/C++ & FORTRAN, w/threadsafe, in debug mode
Linux/64-amd64 2.6 (amani) 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-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
Mac OS X/32 10.6.3 (amazon) in debug mode
Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe,
in production mode
Diffstat (limited to 'src/H5HFiblock.c')
| -rw-r--r-- | src/H5HFiblock.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c index b7fb666..0742cfc 100644 --- a/src/H5HFiblock.c +++ b/src/H5HFiblock.c @@ -566,7 +566,7 @@ H5HF_man_iblock_root_double(H5HF_hdr_t *hdr, hid_t dxpl_id, size_t min_dblock_si /* Resize pinned indirect block in the cache, if its changed size */ if(old_iblock_size != iblock->size) { - if(H5AC_resize_pinned_entry(iblock, (size_t)iblock->size) < 0) + if(H5AC_resize_entry(iblock, (size_t)iblock->size) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block") } /* end if */ @@ -735,7 +735,7 @@ H5HF_man_iblock_root_halve(H5HF_indirect_t *iblock, hid_t dxpl_id) /* Resize pinned indirect block in the cache, if it has changed size */ if(old_size != iblock->size) { - if(H5AC_resize_pinned_entry(iblock, (size_t)iblock->size) < 0) + if(H5AC_resize_entry(iblock, (size_t)iblock->size) < 0) HGOTO_ERROR(H5E_HEAP, H5E_CANTRESIZE, FAIL, "unable to resize fractal heap indirect block") } /* end if */ |