diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-12 00:41:09 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-12 00:41:09 (GMT) |
| commit | 9c660949f55f13b59ff4253184e7d62dfad548c3 (patch) | |
| tree | 4cddbd026329458f12a847e2931cdeb5b17ab967 | |
| parent | 809e91b53c141011ba7c0b641f41959c64e38500 (diff) | |
| download | hdf5-9c660949f55f13b59ff4253184e7d62dfad548c3.zip hdf5-9c660949f55f13b59ff4253184e7d62dfad548c3.tar.gz hdf5-9c660949f55f13b59ff4253184e7d62dfad548c3.tar.bz2 | |
[svn-r18769] Description:
Bring r18768 from trunk to 1.8 branch:
Correct a mis-merged patch when marking an entry dirty.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
Linux/64-amd64 2.6 (abe) w/parallel, w/FORTRAN, in production mode
(h5committested on trunk)
| -rw-r--r-- | testpar/t_cache.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/testpar/t_cache.c b/testpar/t_cache.c index d53a227..b69b7c9 100644 --- a/testpar/t_cache.c +++ b/testpar/t_cache.c @@ -2793,7 +2793,7 @@ mark_entry_dirty(H5C_t * cache_ptr, entry_ptr = &(data[idx]); - HDassert ( entry_ptr->global_pinned ); + HDassert ( entry_ptr->locked || entry_ptr->global_pinned ); HDassert ( ! (entry_ptr->local_pinned) ); (entry_ptr->ver)++; @@ -2810,7 +2810,7 @@ mark_entry_dirty(H5C_t * cache_ptr, world_mpi_rank, fcn_name); } } - else + else if ( ! ( entry_ptr->locked ) ) { global_dirty_pins++; } |