diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 01:48:23 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2010-04-02 01:48:23 (GMT) |
| commit | bacf7149e948c6c33401a9ecb0ad16e60805a9a2 (patch) | |
| tree | 8e4a2b205b7bbed025d6b58066f55a8e21c920d4 /src/H5FSsection.c | |
| parent | 2b8896eea1636e62ee6cbdd8bc6344b18c704566 (diff) | |
| download | hdf5-bacf7149e948c6c33401a9ecb0ad16e60805a9a2.zip hdf5-bacf7149e948c6c33401a9ecb0ad16e60805a9a2.tar.gz hdf5-bacf7149e948c6c33401a9ecb0ad16e60805a9a2.tar.bz2 | |
[svn-r18495] Description:
Bring r18494 from trunk to 1.8 branch:
Bring r18491 from metadata journaling "merging" branch to trunk:
Extract data structure 'destroy' routines from metadata cache client
'destroy' callbacks.
Tested on:
FreeBSD/32 6.3 (duty) w/debug
(h5committested on trunk)
Diffstat (limited to 'src/H5FSsection.c')
| -rw-r--r-- | src/H5FSsection.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/H5FSsection.c b/src/H5FSsection.c index 9bdd99a..d367238 100644 --- a/src/H5FSsection.c +++ b/src/H5FSsection.c @@ -159,7 +159,7 @@ HDfprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n", HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section bin array") /* Increment the reference count on the free space manager header */ - if(H5FS_incr(f, fspace) < 0) + if(H5FS_incr(fspace) < 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTINC, NULL, "unable to increment ref. count on free space header") sinfo->fspace = fspace; @@ -335,7 +335,7 @@ HDfprintf(stderr, "%s: fspace->alloc_sect_size = %Hu, fspace->sect_size = %Hu\n" /* Assume that the modification will affect the statistics in the header * and mark that dirty also */ - if(H5FS_dirty(f, fspace) < 0) + if(H5FS_dirty(fspace) < 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty") } /* end if */ @@ -430,7 +430,7 @@ HDfprintf(stderr, "%s: Relinquishing section info ownership\n", FUNC); /* If we haven't already marked the header dirty, do so now */ if(!modified) - if(H5FS_dirty(f, fspace) < 0) + if(H5FS_dirty(fspace) < 0) HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty") #ifdef H5FS_SINFO_DEBUG |