mirror of
https://github.com/HDFGroup/hdf5.git
synced 2025-04-18 17:40:55 +08:00
[svn-r18768] Description:
Correct a mis-merged patch when marking an entry dirty. 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
This commit is contained in:
parent
33f060108b
commit
bb26d1fe8d
@ -2794,7 +2794,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)++;
|
||||
@ -2811,7 +2811,7 @@ mark_entry_dirty(H5C_t * cache_ptr,
|
||||
world_mpi_rank, fcn_name);
|
||||
}
|
||||
}
|
||||
else
|
||||
else if ( ! ( entry_ptr->locked ) )
|
||||
{
|
||||
global_dirty_pins++;
|
||||
}
|
||||
|
Loading…
x
Reference in New Issue
Block a user