diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 14:19:28 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 14:19:28 (GMT) |
| commit | b95c7d1879120c542490c031c70b88f6e5fa7eaa (patch) | |
| tree | a5f2c84b23c43eb342220d811d2b9d4f69fb738b /src/H5Oalloc.c | |
| parent | 2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f (diff) | |
| download | hdf5-b95c7d1879120c542490c031c70b88f6e5fa7eaa.zip hdf5-b95c7d1879120c542490c031c70b88f6e5fa7eaa.tar.gz hdf5-b95c7d1879120c542490c031c70b88f6e5fa7eaa.tar.bz2 | |
[svn-r18722] Description:
Bring r18721 from trunk to 1.8 branch:
Bring r18720 from metadata journaling merging branch to trunk:
Bring changes from metadata journaling branch to 'merging' branch:
Rename H5[A]C_mark_pinned_or_protected_entry_dirty() to
H5[A]C_mark_entry_dirty() and get rid of H5[A]C_mark_pinned_entry_dirty().
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committested on trunk)
Diffstat (limited to 'src/H5Oalloc.c')
| -rw-r--r-- | src/H5Oalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Oalloc.c b/src/H5Oalloc.c index 97facc8..186b7f4 100644 --- a/src/H5Oalloc.c +++ b/src/H5Oalloc.c @@ -601,7 +601,7 @@ H5O_alloc_extend_chunk(H5F_t *f, hid_t dxpl_id, H5O_t *oh, unsigned chunkno, oh->flags |= new_size_flags; /* Mark object header as dirty in cache */ - if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0) + if(H5AC_mark_entry_dirty(oh) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty") } /* end if */ @@ -1171,7 +1171,7 @@ H5O_alloc(H5F_t *f, hid_t dxpl_id, H5O_t *oh, const H5O_msg_class_t *type, HGOTO_ERROR(H5E_OHDR, H5E_CANTINSERT, FAIL, "can't split null message") /* Mark object header as dirty in cache */ - if(H5AC_mark_pinned_or_protected_entry_dirty(oh) < 0) + if(H5AC_mark_entry_dirty(oh) < 0) HGOTO_ERROR(H5E_OHDR, H5E_CANTMARKDIRTY, FAIL, "unable to mark object header as dirty") /* Set return value */ |