diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 17:18:50 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-05 17:18:50 (GMT) |
| commit | ca7fc8e96a70b06b08e1db21040056ae17a51906 (patch) | |
| tree | 3d665b7a3119174158fc91a05fd8055f6ca7074b /src/H5EAdblkpage.c | |
| parent | b24e2d4dd861b67a61fcf56be5975bcd4d37203b (diff) | |
| download | hdf5-ca7fc8e96a70b06b08e1db21040056ae17a51906.zip hdf5-ca7fc8e96a70b06b08e1db21040056ae17a51906.tar.gz hdf5-ca7fc8e96a70b06b08e1db21040056ae17a51906.tar.bz2 | |
[svn-r18708] Description:
Bring r18638:18704 from trunk to revise_chunks branch.
Tested on:
Mac OS X/32 10.6.3 (amazon) w/debug & production
(h5committest not required on this branch)
Diffstat (limited to 'src/H5EAdblkpage.c')
| -rw-r--r-- | src/H5EAdblkpage.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/H5EAdblkpage.c b/src/H5EAdblkpage.c index 7b42afc..1876262 100644 --- a/src/H5EAdblkpage.c +++ b/src/H5EAdblkpage.c @@ -213,7 +213,7 @@ H5EA__dblk_page_protect(H5EA_hdr_t *hdr, hid_t dxpl_id, H5EA_sblock_t *parent, haddr_t dblk_page_addr, H5AC_protect_t rw)) /* Local variables */ - H5EA_dblk_page_load_ud_t load_ud; /* Information needed for loading data block page */ + H5EA_dblk_page_cache_ud_t udata; /* Information needed for loading data block page */ #ifdef QAK HDfprintf(stderr, "%s: Called\n", FUNC); @@ -224,10 +224,11 @@ HDfprintf(stderr, "%s: Called\n", FUNC); HDassert(H5F_addr_defined(dblk_page_addr)); /* Set up user data */ - load_ud.parent = parent; + udata.hdr = hdr; + udata.parent = parent; /* Protect the data block page */ - if(NULL == (ret_value = (H5EA_dblk_page_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_DBLK_PAGE, dblk_page_addr, &load_ud, hdr, rw))) + if(NULL == (ret_value = (H5EA_dblk_page_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_EARRAY_DBLK_PAGE, dblk_page_addr, &udata, rw))) H5E_THROW(H5E_CANTPROTECT, "unable to protect extensible array data block page, address = %llu", (unsigned long long)dblk_page_addr) CATCH |