diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 00:44:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 00:44:01 (GMT) |
| commit | 2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f (patch) | |
| tree | 8aff7099e70ef34b5eef72d80b3f1153f953afc6 /src/H5Ochunk.c | |
| parent | e984ec4948e97b5ed3bb4eff293570d1b9ec5e96 (diff) | |
| download | hdf5-2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f.zip hdf5-2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f.tar.gz hdf5-2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f.tar.bz2 | |
[svn-r18717] Description:
Bring r18716 from trunk to 1.8 branch:
Bring r18715 from metadata journaling merging branch to trunk:
Changes to further align trunk with state of metadata journaling branch.
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
Diffstat (limited to 'src/H5Ochunk.c')
| -rw-r--r-- | src/H5Ochunk.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/H5Ochunk.c b/src/H5Ochunk.c index 147d9c6..ee5a629 100644 --- a/src/H5Ochunk.c +++ b/src/H5Ochunk.c @@ -235,16 +235,13 @@ H5O_chunk_unprotect(H5F_t *f, hid_t dxpl_id, H5O_chunk_proxy_t *chk_proxy, if(H5AC_resize_pinned_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 */ + /* Check for dirtying the first chunk */ - else if(chk_flags & H5AC__DIRTIED_FLAG) { + if(chk_flags & H5AC__DIRTIED_FLAG) { /* Mark object header as dirty in cache */ if(H5AC_mark_pinned_or_protected_entry_dirty(chk_proxy->oh) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty") } /* end else/if */ - else { - /* Sanity check */ - HDassert(0 && "Unknown chunk proxy flag(s)?!?"); - } /* end else */ /* Decrement reference count of object header */ if(H5O_dec_rc(chk_proxy->oh) < 0) |