diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-20 12:43:30 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-20 12:43:30 (GMT) |
| commit | 83f50e5a722f7a58562a0885fef695f74bce7285 (patch) | |
| tree | 604f4dad662be4824a77eb85cffa3639cd35a9de /src/H5HFdblock.c | |
| parent | 02a23331992c618bb3cacb35bc0ea52f36ba1482 (diff) | |
| download | hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.zip hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.tar.gz hdf5-83f50e5a722f7a58562a0885fef695f74bce7285.tar.bz2 | |
[svn-r18865] Description:
Bring r18864 from trunk to 1.8 branch:
General cleanups to align metadata journaling branch and trunk
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5HFdblock.c')
| -rw-r--r-- | src/H5HFdblock.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/H5HFdblock.c b/src/H5HFdblock.c index d886f4e..8db697e 100644 --- a/src/H5HFdblock.c +++ b/src/H5HFdblock.c @@ -467,6 +467,7 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, */ if(hdr->filter_len > 0) { if(par_iblock == NULL) { + udata.odi_size = hdr->pline_root_direct_size; udata.filter_mask = hdr->pline_root_direct_filter_mask; } /* end if */ else { @@ -474,11 +475,14 @@ H5HF_man_dblock_protect(H5HF_hdr_t *hdr, hid_t dxpl_id, haddr_t dblock_addr, HDassert(H5F_addr_eq(par_iblock->ents[par_entry].addr, dblock_addr)); /* Set up parameters to read filtered direct block */ + udata.odi_size = par_iblock->filt_ents[par_entry].size; udata.filter_mask = par_iblock->filt_ents[par_entry].filter_mask; } /* end else */ } /* end if */ - else + else { + udata.odi_size = dblock_size; udata.filter_mask = 0; + } /* end else */ /* Protect the direct block */ if(NULL == (dblock = (H5HF_direct_t *)H5AC_protect(hdr->f, dxpl_id, H5AC_FHEAP_DBLOCK, dblock_addr, &udata, rw))) |