summaryrefslogtreecommitdiffstats
path: root/src/H5HGcache.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2010-05-05 22:47:56 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2010-05-05 22:47:56 (GMT)
commit93170b425a30c328c3db0183d8870c6e535c9d7c (patch)
treeb329e021fddcf8544e8f928eae0401eac8796752 /src/H5HGcache.c
parentf0ecd713070b869c0d89d2ff0c991ade04852177 (diff)
downloadhdf5-93170b425a30c328c3db0183d8870c6e535c9d7c.zip
hdf5-93170b425a30c328c3db0183d8870c6e535c9d7c.tar.gz
hdf5-93170b425a30c328c3db0183d8870c6e535c9d7c.tar.bz2
[svn-r18716] Description:
Bring r18715 from metadata journaling merging branch to trunk: Changes to further align trunk with state of metadata journaling branch. 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 Mac OS X/32 10.6.3 (amazon) in debug mode Mac OS X/32 10.6.3 (amazon) w/C++ & FORTRAN, w/threadsafe, in production mode
Diffstat (limited to 'src/H5HGcache.c')
-rw-r--r--src/H5HGcache.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/src/H5HGcache.c b/src/H5HGcache.c
index e234d41..a3cf5b1 100644
--- a/src/H5HGcache.c
+++ b/src/H5HGcache.c
@@ -131,7 +131,6 @@ H5HG_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *udata)
/* Read the initial 4k page */
if(NULL == (heap = H5FL_CALLOC(H5HG_heap_t)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
- heap->addr = addr;
heap->shared = f->shared;
if(NULL == (heap->chunk = H5FL_BLK_MALLOC(gheap_chunk, (size_t)H5HG_MINSIZE)))
HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")