diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-02 22:30:16 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2009-03-02 22:30:16 (GMT) |
| commit | 19105560d05e18a2793ef330bac1234aed2e8914 (patch) | |
| tree | 10d0e34de12191c45aa89cd0c7b68b0db2c5e3c4 /src/H5Dmpio.c | |
| parent | b359f8d3b37b03748346fd87b9c20cbd95b8db8e (diff) | |
| download | hdf5-19105560d05e18a2793ef330bac1234aed2e8914.zip hdf5-19105560d05e18a2793ef330bac1234aed2e8914.tar.gz hdf5-19105560d05e18a2793ef330bac1234aed2e8914.tar.bz2 | |
[svn-r16536] Description:
Bring v16532 back from trunk to v1.8 branch:
Pass the chunk "user data" to H5D_chunk_unlock(), so that chunks with
an address already aren't reallocated.
Tested on:
FreeBSD/32 6.3 (duty) in debug mode
(h5committest not needed here, performed on trunk)
Diffstat (limited to 'src/H5Dmpio.c')
| -rw-r--r-- | src/H5Dmpio.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/H5Dmpio.c b/src/H5Dmpio.c index 8757ba7..e4dd8b5 100644 --- a/src/H5Dmpio.c +++ b/src/H5Dmpio.c @@ -1272,7 +1272,7 @@ if(H5DEBUG(D)) } /* end else */ /* Release the cache lock on the chunk. */ - if(chunk && H5D_chunk_unlock(io_info, (io_info->op_type == H5D_IO_OP_WRITE), idx_hint, chunk, accessed_bytes) < 0) + if(chunk && H5D_chunk_unlock(io_info, &udata, (io_info->op_type == H5D_IO_OP_WRITE), idx_hint, chunk, accessed_bytes) < 0) HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk") } /* end if */ #else /* !defined(H5_MPI_COMPLEX_DERIVED_DATATYPE_WORKS) || !defined(H5_MPI_SPECIAL_COLLECTIVE_IO_WORKS) */ @@ -1502,7 +1502,7 @@ if(H5DEBUG(D)) { /* Release the cache lock on the chunk. */ if(chunk) - if(H5D_chunk_unlock(io_info, (io_info->op_type == H5D_IO_OP_WRITE), idx_hint, chunk, accessed_bytes) < 0) + if(H5D_chunk_unlock(io_info, &udata, (io_info->op_type == H5D_IO_OP_WRITE), idx_hint, chunk, accessed_bytes) < 0) HGOTO_ERROR(H5E_IO, H5E_READERROR, FAIL, "unable to unlock raw data chunk") } /* end if */ else { /*collective I/O */ |