diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 03:02:03 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-07 03:02:03 (GMT) |
| commit | ae6f5891b5794325ee5702fec0da55bafdce1afe (patch) | |
| tree | 907e8fd4d6cdd73dd007f10efb27e682a58f7df6 /src/H5Ochunk.c | |
| parent | e87f3dd558a96c6ebedd03a8ac8acb91cb5e1be8 (diff) | |
| download | hdf5-ae6f5891b5794325ee5702fec0da55bafdce1afe.zip hdf5-ae6f5891b5794325ee5702fec0da55bafdce1afe.tar.gz hdf5-ae6f5891b5794325ee5702fec0da55bafdce1afe.tar.bz2 | |
[svn-r18741] Description:
Bring r18740 from trunk to 1.8 branch:
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
(h5committested on trunk)
Diffstat (limited to 'src/H5Ochunk.c')
| -rw-r--r-- | src/H5Ochunk.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c index e8f2afa..5fba81b 100644 --- a/src/H5Ochunk.c +++ b/src/H5Ochunk.c @@ -232,7 +232,7 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy, /* Check for resizing the first chunk */ if(chk_flags & H5AC__SIZE_CHANGED_FLAG) { /* Resize object header in cache */ - if(H5AC_resize_pinned_entry(chk_proxy->oh, chk_proxy->oh->chunk[0].size) < 0) + if(H5AC_resize_entry(chk_proxy->oh, chk_proxy->oh->chunk[0].size) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTRESIZE, FAIL, "unable to resize chunk in cache") } /* end if */ |