diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 00:44:01 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-05-06 00:44:01 (GMT) |
| commit | 2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f (patch) | |
| tree | 8aff7099e70ef34b5eef72d80b3f1153f953afc6 /src/H5FScache.c | |
| parent | e984ec4948e97b5ed3bb4eff293570d1b9ec5e96 (diff) | |
| download | hdf5-2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f.zip hdf5-2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f.tar.gz hdf5-2c38d7ea30aa8829eb7790f7aa25b16dee93fb8f.tar.bz2 | |
[svn-r18717] Description:
Bring r18716 from trunk to 1.8 branch:
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
Diffstat (limited to 'src/H5FScache.c')
| -rw-r--r-- | src/H5FScache.c | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/src/H5FScache.c b/src/H5FScache.c index 2f7a4eb..351044a 100644 --- a/src/H5FScache.c +++ b/src/H5FScache.c @@ -163,7 +163,6 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); HDassert(udata); /* Allocate a new free space manager */ @@ -171,7 +170,7 @@ H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") /* Set free space manager's internal information */ - fspace->addr = addr; + fspace->addr = udata->addr; /* Wrap the local buffer for serialized header info */ if(NULL == (wb = H5WB_wrap(hdr_buf, sizeof(hdr_buf)))) @@ -587,17 +586,12 @@ H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, void *_udata) /* Check arguments */ HDassert(f); - HDassert(H5F_addr_defined(addr)); HDassert(udata); /* Allocate a new free space section info */ if(NULL == (sinfo = H5FS_sinfo_new(udata->f, udata->fspace))) HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed") - /* Sanity check address */ - if(H5F_addr_ne(addr, udata->fspace->sect_addr)) - HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "incorrect address for free space sections") - /* Allocate space for the buffer to serialize the sections into */ H5_ASSIGN_OVERFLOW(/* To: */ old_sect_size, /* From: */ udata->fspace->sect_size, /* From: */ hsize_t, /* To: */ size_t); if(NULL == (buf = H5FL_BLK_MALLOC(sect_block, (size_t)udata->fspace->sect_size))) |