summaryrefslogtreecommitdiffstats
path: root/src/H5Fsuper.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-06 14:19:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-06 14:19:28 (GMT)
commitb95c7d1879120c542490c031c70b88f6e5fa7eaa (patch)
treea5f2c84b23c43eb342220d811d2b9d4f69fb738b /src/H5Fsuper.c
parent2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f (diff)
downloadhdf5-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/H5Fsuper.c')
-rw-r--r--src/H5Fsuper.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Fsuper.c b/src/H5Fsuper.c
index 5d77cec..0a40d13 100644
--- a/src/H5Fsuper.c
+++ b/src/H5Fsuper.c
@@ -633,7 +633,7 @@ H5F_super_dirty(H5F_t *f)
HDassert(f->shared->sblock);
/* Mark superblock dirty in cache, so change to EOA will get encoded */
- if(H5AC_mark_pinned_or_protected_entry_dirty(f->shared->sblock) < 0)
+ if(H5AC_mark_entry_dirty(f->shared->sblock) < 0)
HGOTO_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
done:
@@ -797,7 +797,7 @@ H5F_super_ext_write_msg(H5F_t *f, hid_t dxpl_id, void *mesg, unsigned id, hbool_
done:
/* Mark superblock dirty in cache, if necessary */
if(sblock_dirty)
- if(H5AC_mark_pinned_or_protected_entry_dirty(f->shared->sblock) < 0)
+ if(H5AC_mark_entry_dirty(f->shared->sblock) < 0)
HDONE_ERROR(H5E_FILE, H5E_CANTMARKDIRTY, FAIL, "unable to mark superblock as dirty")
FUNC_LEAVE_NOAPI(ret_value)