From 9c660949f55f13b59ff4253184e7d62dfad548c3 Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Tue, 11 May 2010 19:41:09 -0500 Subject: [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) --- testpar/t_cache.c | 4 ++-- 1 file 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++; } -- cgit v0.12