diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 21:55:22 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 21:55:22 (GMT) |
| commit | cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db (patch) | |
| tree | 1e9ed63b05346164bbd792bb4f5bec7154290cea /src/H5O.c | |
| parent | b60f90da91886edc2afaaca9bf1587d7591051e1 (diff) | |
| download | hdf5-cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db.zip hdf5-cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db.tar.gz hdf5-cb772e9939a8dd4e447ad7f8e4cf2fdefb8f37db.tar.bz2 | |
[svn-r18714] Description:
Simplify parameters to 'deserialize' cache client callback.
Tested on:
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/H5O.c')
| -rw-r--r-- | src/H5O.c | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -1583,6 +1583,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot) udata.common.mesgs_modified = FALSE; HDmemset(&cont_msg_info, 0, sizeof(cont_msg_info)); udata.common.cont_msg_info = &cont_msg_info; + udata.common.addr = loc->addr; /* Lock the object header into the cache */ if(NULL == (oh = (H5O_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR, loc->addr, (size_t)H5O_SPEC_READ_SIZE, &udata, prot))) @@ -1619,6 +1620,7 @@ H5O_protect(const H5O_loc_t *loc, hid_t dxpl_id, H5AC_protect_t prot) /* Bring the chunk into the cache */ /* (which adds to the object header */ + chk_udata.common.addr = cont_msg_info.msgs[curr_msg].addr; if(NULL == (chk_proxy = (H5O_chunk_proxy_t *)H5AC_protect(loc->file, dxpl_id, H5AC_OHDR_CHK, cont_msg_info.msgs[curr_msg].addr, cont_msg_info.msgs[curr_msg].size, &chk_udata, prot))) HGOTO_ERROR(H5E_OHDR, H5E_CANTPROTECT, NULL, "unable to load object header chunk") |