[svn-r12525] Description:

    Refactored free space manager to use metadata cache for serialized free
space sections.  This speeds up the fractal heap test considerably...

Tested:
    FreeBSD 4.11 (sleipnir)
    Linux 2.4/32 (chicago)
    Linux 2.4/64 (mir)
    Mac OS X (amazon)

23 files changed, 3006 insertions, 3147 deletions

diff --git a/MANIFEST b/MANIFEST
index b2b6531..42a8c52 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -481,6 +481,7 @@
 ./src/H5FSpkg.h
 ./src/H5FSprivate.h
 ./src/H5FSpublic.h
+./src/H5FSsection.c
 ./src/H5G.c
 ./src/H5Gdeprec.c
 ./src/H5Gent.c
diff --git a/src/H5.c b/src/H5.c
index 59bf8b6..d873797 100644
--- a/src/H5.c
+++ b/src/H5.c
@@ -231,7 +231,6 @@ H5_term_library(void)
          * that depend on them. -QAK
          */
         if(pending==0) {
-            pending += DOWN(FS);
             pending += DOWN(AC);
             pending += DOWN(Z);
             pending += DOWN(FD);
diff --git a/src/H5AC.c b/src/H5AC.c
index a7ae790..49625b9 100644
--- a/src/H5AC.c
+++ b/src/H5AC.c
@@ -487,6 +487,7 @@ static const char * H5AC_entry_type_names[H5AC_NTYPES] =
     "fractal heap direct blocks",
     "fractal heap indirect blocks",
     "free space headers",
+    "free space sections",
     "test entry"	/* for testing only -- not used for actual files */
 };
 
diff --git a/src/H5ACprivate.h b/src/H5ACprivate.h
index 2cbda20..a1c8322 100644
--- a/src/H5ACprivate.h
+++ b/src/H5ACprivate.h
@@ -58,6 +58,7 @@ typedef enum {
     H5AC_FHEAP_DBLOCK_ID, /*fractal heap direct block		     */
     H5AC_FHEAP_IBLOCK_ID, /*fractal heap indirect block		     */
     H5AC_FSPACE_HDR_ID,	/*free space header			     */
+    H5AC_FSPACE_SINFO_ID,/*free space sections			     */
     H5AC_TEST_ID,	/*test entry -- not used for actual files    */
     H5AC_NTYPES		/* Number of types, must be last             */
 } H5AC_type_t;
diff --git a/src/H5Cpkg.h b/src/H5Cpkg.h
index 1a32f0a..72e775f 100644
--- a/src/H5Cpkg.h
+++ b/src/H5Cpkg.h
@@ -707,7 +707,7 @@
  ****************************************************************************/
 
 #define H5C__H5C_T_MAGIC	0x005CAC0E
-#define H5C__MAX_NUM_TYPE_IDS	13
+#define H5C__MAX_NUM_TYPE_IDS	14
 #define H5C__PREFIX_LEN		32
 
 struct H5C_t
diff --git a/src/H5F.c b/src/H5F.c
index 24f4e9c..80fccd3 100644
--- a/src/H5F.c
+++ b/src/H5F.c
@@ -27,7 +27,6 @@
 #include "H5Fpkg.h"             /* File access				*/
 #include "H5FDprivate.h"	/* File drivers				*/
 #include "H5FLprivate.h"	/* Free lists                           */
-#include "H5FSprivate.h"	/* File free space                      */
 #include "H5Gprivate.h"		/* Groups				*/
 #include "H5Iprivate.h"		/* IDs			  		*/
 #include "H5MMprivate.h"	/* Memory management			*/
@@ -2333,13 +2332,6 @@ H5F_flush(H5F_t *f, hid_t dxpl_id, H5F_scope_t scope, unsigned flags)
             if (H5F_flush(f->mtab.child[i].file, dxpl_id, scope, flags) < 0)
                 nerrors++;
 
-    /* Flush any cached free space info */
-    /* (Make certain that this is before the metadata cache flush, so the
-     *  updated free space info in the metadata cache gets flushed out to disk)
-     */
-    if (H5FS_flush(f, dxpl_id, flags) < 0)
-        HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush free space info")
-
     /* Flush any cached dataset storage raw data */
     if (H5D_flush(f, dxpl_id, flags) < 0)
         HGOTO_ERROR(H5E_CACHE, H5E_CANTFLUSH, FAIL, "unable to flush dataset cache")
diff --git a/src/H5FDpublic.h b/src/H5FDpublic.h
index 3ba7275..f50a7fa 100644
--- a/src/H5FDpublic.h
+++ b/src/H5FDpublic.h
@@ -69,7 +69,7 @@ typedef enum H5FD_mem_t {
  *      -QAK
  */
 #define H5FD_MEM_FSPACE_HDR     H5FD_MEM_OHDR
-#define H5FD_MEM_FSPACE_SECTS   H5FD_MEM_LHEAP
+#define H5FD_MEM_FSPACE_SINFO   H5FD_MEM_LHEAP
 
 /*
  * A free-list map which maps all types of allocation requests to a single
diff --git a/src/H5FS.c b/src/H5FS.c
index ca9e321..7d77351 100644
--- a/src/H5FS.c
+++ b/src/H5FS.c
@@ -28,9 +28,6 @@
 
 #define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
 
-/* Interface initialization */
-#define H5_INTERFACE_INIT_FUNC	H5FS_init_interface
-
 /***********/
 /* Headers */
 /***********/
@@ -38,65 +35,16 @@
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FSpkg.h"		/* File free space			*/
 #include "H5MFprivate.h"	/* File memory management		*/
-#include "H5Vprivate.h"		/* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
 /****************/
 
-/* File free space format version #'s */
-#define H5FS_SECTS_VERSION      0               /* Serialized sections */
-
-/* Default starting size of section buffer */
-#define H5FS_SECT_SIZE_DEFAULT  64
-
-/* Max. height of the skip list holding free list nodes */
-#define H5FS_DEFAULT_SKIPLIST_HEIGHT     16
-
-/* Size of the free space serialized sections on disk */
-#define H5FS_SECTS_PREFIX_SIZE(f) (                                           \
-    /* General metadata fields */                                             \
-    H5FS_METADATA_PREFIX_SIZE                                                 \
-                                                                              \
-    /* Free space serialized sections specific fields */                      \
-    + H5F_SIZEOF_ADDR(f) /* Address of free space header for these sections */ \
-    )
-
-/* Uncomment this macro to enable extra sanity checking */
-/* #define H5FS_DEBUG */
 
 /******************/
 /* Local Typedefs */
 /******************/
 
-/* Free space node for free space sections of the same size */
-typedef struct H5FS_node_t {
-    hsize_t sect_size;          /* Size of all sections on list */
-    size_t serial_count;        /* # of serializable sections on list */
-    size_t ghost_count;         /* # of un-serializable sections on list */
-    H5SL_t *sect_list;          /* Skip list to hold pointers to actual free list section node */
-} H5FS_node_t;
-
-/* User data for skip list iterator callback for syncing section info */
-typedef struct {
-    H5F_t *f;                   /* Pointer to the file */
-    hid_t dxpl_id;              /* Dataset transfer property list */
-} H5FS_iter_ud1_t;
-
-/* User data for skip list iterator callback for iterating over section size nodes when syncing */
-typedef struct {
-    H5FS_t *fspace;             /* Free space manager info */
-    uint8_t **p;                /* Pointer to address of buffer pointer to serialize with */
-    unsigned sect_cnt_size;     /* # of bytes to encode section size counts in */
-} H5FS_iter_ud2_t;
-
-/* User data for skip list iterator callback for iterating over section size nodes */
-typedef struct {
-    H5FS_t *fspace;             /* Free space manager info */
-    H5FS_operator_t op;         /* Operator for the iteration */
-    void *op_data;              /* Information to pass to the operator */
-} H5FS_iter_ud3_t;
-
 
 /********************/
 /* Package Typedefs */
@@ -106,36 +54,6 @@ typedef struct {
 /********************/
 /* Local Prototypes */
 /********************/
-static herr_t H5FS_open_add(H5FS_t *fspace);
-static herr_t H5FS_open_remove(H5FS_t *fspace);
-static herr_t H5FS_init(H5FS_t *fspace);
-static herr_t H5FS_sect_free_cb(void *item, void *key, void *op_data);
-static herr_t H5FS_node_free_cb(void *item, void *key, void *op_data);
-static herr_t H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls);
-static herr_t H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls);
-static herr_t H5FS_size_node_decr(H5FS_t *fspace, unsigned bin, H5FS_node_t *fspace_node,
-    const H5FS_section_class_t *cls);
-static herr_t H5FS_sect_unlink_size(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect);
-static herr_t H5FS_sect_unlink_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    const H5FS_section_class_t *cls, H5FS_section_info_t *sect);
-static herr_t H5FS_sect_link_size_bin(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect);
-static herr_t H5FS_sect_link_size(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect);
-static herr_t H5FS_sect_link_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    const H5FS_section_class_t *cls, H5FS_section_info_t *sect);
-static herr_t H5FS_sect_link(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *sect);
-static herr_t H5FS_sect_merge(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t **sect, void *op_data);
-static htri_t H5FS_find_bin_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node);
-static herr_t H5FS_serialize_sect_cb(void *_item, void UNUSED *key, void *_udata);
-static herr_t H5FS_serialize_node_cb(void *_item, void UNUSED *key, void *_udata);
-static size_t H5FS_serialize_size(H5FS_t *fspace);
-static herr_t H5FS_serialize_bins(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
-static herr_t H5FS_deserialize_bins(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
-static herr_t H5FS_flush_cb(void *_item, void *key, void *_udata);
 #ifdef H5FS_DEBUG
 herr_t H5FS_assert(const H5FS_t *fspace);
 #endif /* H5FS_DEBUG */
@@ -148,8 +66,8 @@ herr_t H5FS_assert(const H5FS_t *fspace);
 /* Declare a free list to manage the H5FS_section_class_t sequence information */
 H5FL_SEQ_DEFINE(H5FS_section_class_t);
 
-/* Declare a free list to manage the H5FS_hdr_t struct */
-H5FL_DEFINE(H5FS_hdr_t);
+/* Declare a free list to manage the H5FS_t struct */
+H5FL_DEFINE(H5FS_t);
 
 
 /*****************************/
@@ -161,190 +79,69 @@ H5FL_DEFINE(H5FS_hdr_t);
 /* Local Variables */
 /*******************/
 
-/* Skip list to track open free space managers */
-H5SL_t *H5FS_open_g = NULL;
-
-/* Declare a free list to manage the H5FS_t struct */
-H5FL_DEFINE_STATIC(H5FS_t);
-
-/* Declare a free list to manage the H5FS_node_t struct */
-H5FL_DEFINE_STATIC(H5FS_node_t);
-
-/* Declare a free list to manage the H5FS_bin_t sequence information */
-H5FL_SEQ_DEFINE_STATIC(H5FS_bin_t);
-
-/* Declare a free list to manage free space section data to/from disk */
-H5FL_BLK_DEFINE_STATIC(sect_block);
-
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_init_interface
- *
- * Purpose:	Initialize static free space memory structures
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May 8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_init_interface(void)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_init_interface)
-
-    /* Create the skip list to track open free space managers */
-    HDassert(H5FS_open_g == NULL);
-    if(NULL == (H5FS_open_g = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for tracking open free space managers")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_init_interface() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_term_interface
- *
- * Purpose:	Terminate this interface.
+ * Function:	H5FS_pin
  *
- * Return:	Success:	Positive if anything was done that might
- *				affect other interfaces; zero otherwise.
+ * Purpose:	Pin a free space manager header in memory
  *
- * 		Failure:	Negative.
- *
- * Programmer:	Quincey Koziol
- *              Monday, May 8, 2006
- *
- *-------------------------------------------------------------------------
- */
-int
-H5FS_term_interface(void)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_term_interface)
-
-    if(H5_interface_initialize_g) {
-        /* Release the open free space manager list */
-        HDassert(H5FS_open_g);
-
-        /* All the free space managers should be shut down by now */
-        HDassert(H5SL_count(H5FS_open_g) == 0);
-
-        /* Close the skip list to track the open free space managers */
-        H5SL_close(H5FS_open_g);
-        H5FS_open_g = NULL;
-
-        /* Interface has been shut down */
-        H5_interface_initialize_g = 0;
-    } /* end if */
-
-    FUNC_LEAVE_NOAPI(0)
-} /* end H5FS_term_interface() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_open_add
- *
- * Purpose:	Add a free space manager to the list of open ones
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
+ * Return:	Success:	Pointer to free space structure
+ *		Failure:	NULL
  *
  * Programmer:	Quincey Koziol
- *              Monday, May 8, 2006
+ *              Monday, July 31, 2006
  *
  *-------------------------------------------------------------------------
  */
-static herr_t
-H5FS_open_add(H5FS_t *fspace)
+static H5FS_t *
+H5FS_pin(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses,
+    const H5FS_section_class_t *classes[], void *cls_init_udata)
 {
-    herr_t ret_value = SUCCEED;         /* Return value */
+    H5FS_t *fspace = NULL;      /* New free space structure */
+    H5FS_prot_t fs_prot;        /* Information for protecting free space manager */
+    unsigned fspace_status = 0; /* Free space header's status in the metadata cache */
+    H5FS_t *ret_value;          /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_open_add)
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_pin)
 
     /* Check arguments. */
-    HDassert(fspace);
+    HDassert(f);
+    HDassert(H5F_addr_defined(fs_addr));
+    HDassert(nclasses > 0);
+    HDassert(classes);
 
-    /* Add the free space manager to the list of open managers */
-    if(H5SL_insert(H5FS_open_g, fspace, &fspace->addr) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space manager into skip list")
+    /* Initialize user data for protecting the free space manager */
+    fs_prot.nclasses = nclasses;
+    fs_prot.classes = classes;
+    fs_prot.cls_init_udata = cls_init_udata;
 
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_open_add() */
+    /* Protect the free space header */
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &fs_prot, NULL, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space header")
 
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_open_remove
- *
- * Purpose:	Remove a free space manager from the list of open ones
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May 8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_open_remove(H5FS_t *fspace)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
+    /* Check the free space header's status in the metadata cache */
+    if(H5AC_get_entry_status(f, fs_addr, &fspace_status) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTGET, NULL, "unable to check metadata cache status for free space header")
 
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_open_remove)
+    /* If the free space header isn't already pinned, pin it now */
+    /* (could still be pinned from it's section info still hanging around in the cache) */
+    if(!(fspace_status & H5AC_ES__IS_PINNED)) {
+        /* Pin free space header in the cache */
+        if(H5AC_pin_protected_entry(f, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, NULL, "unable to pin free space header")
+    } /* end if */
 
-    /* Check arguments. */
-    HDassert(fspace);
+    /* Unlock free space header, now pinned */
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space header")
 
-    /* Remove the free space manager from the list of open managers */
-    if(NULL == H5SL_remove(H5FS_open_g, &fspace->addr))
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space manager from skip list")
+    /* Set return value */
+    ret_value = fspace;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_open_remove() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_init
- *
- * Purpose:	Initialize free space memory structures
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, April 18, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_init(H5FS_t *fspace)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_init)
-
-    /* Check arguments. */
-    HDassert(fspace);
-
-    /* Initialize free space memory structures */
-    fspace->single = NULL;
-    fspace->bins = NULL;
-    fspace->merge_list = NULL;
-    fspace->serial_size = 0;
-    fspace->tot_size_count = fspace->serial_size_count = fspace->ghost_size_count = 0;
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5FS_init() */
+} /* H5FS_pin() */
 
 
 /*-------------------------------------------------------------------------
@@ -366,8 +163,6 @@ H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_c
     size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata)
 {
     H5FS_t *fspace = NULL;      /* New free space structure */
-    H5FS_hdr_t *fs_hdr = NULL;  /* New free space header */
-    size_t u;                   /* Local index variable */
     H5FS_t *ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(H5FS_create, NULL)
@@ -382,104 +177,33 @@ H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr, const H5FS_create_t *fs_c
     /*
      * Allocate free space structure
      */
-    if(NULL == (fspace = H5FL_CALLOC(H5FS_t)))
+    if(NULL == (fspace = H5FS_new(nclasses, classes, cls_init_udata)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
 
-    /* Set immutable free list parameters */
-    if(NULL == (fspace->sect_cls = H5FL_SEQ_MALLOC(H5FS_section_class_t, nclasses)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section class array ")
-
-    /* Initialize the section classes for this free space list */
-    for(u = 0; u < nclasses; u++) {
-        /* Make certain that section class type can be used as an array index into this array */
-        HDassert(u == classes[u]->type);
-
-        /* Copy the class information into the free space manager */
-        HDmemcpy(&fspace->sect_cls[u], classes[u], sizeof(H5FS_section_class_t));
-
-        /* Call the class initialization routine, if there is one */
-        if(fspace->sect_cls[u].init_cls)
-            if((fspace->sect_cls[u].init_cls)(&fspace->sect_cls[u], cls_init_udata) < 0)
-                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "unable to initialize section class")
-    } /* end for */
-
     /* Allocate space for the free space header */
     if(HADDR_UNDEF == (fspace->addr = H5MF_alloc(f, H5FD_MEM_FSPACE_HDR, dxpl_id, (hsize_t)H5FS_HEADER_SIZE(f))))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "file allocation failed for free space header")
     *fs_addr = fspace->addr;
 
-    /* Construct the free space header */
-    if(NULL == (fs_hdr = H5FL_MALLOC(H5FS_hdr_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&fs_hdr->cache_info, 0, sizeof(H5AC_info_t));
-
-    /* Initialize information for header */
-    fs_hdr->tot_space = 0;
-    fs_hdr->tot_sect_count = fs_hdr->serial_sect_count = fs_hdr->ghost_sect_count = 0;
-    fs_hdr->nclasses = nclasses;
-    fs_hdr->client = fs_create->client;
-    fs_hdr->shrink_percent = fs_create->shrink_percent;
-    fs_hdr->expand_percent = fs_create->expand_percent;
-    fs_hdr->max_sect_addr = fs_create->max_sect_addr;
-    fs_hdr->max_sect_size = fs_create->max_sect_size;
-    fs_hdr->alloc_sect_size = 0;
-    fs_hdr->sect_addr = HADDR_UNDEF;
+    /* Initialize creation information for free space manager */
+    fspace->client = fs_create->client;
+    fspace->shrink_percent = fs_create->shrink_percent;
+    fspace->expand_percent = fs_create->expand_percent;
+    fspace->max_sect_addr = fs_create->max_sect_addr;
+    fspace->max_sect_size = fs_create->max_sect_size;
 
     /* Cache the new free space header */
-    if(H5AC_set(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, fs_hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(H5AC_set(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, fspace, H5AC__NO_FLAGS_SET) < 0)
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space header to cache")
-    fs_hdr = NULL;
+    fspace = NULL;
 
-    /* Lock the free space  header into memory */
-    if(NULL == (fs_hdr = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, NULL, NULL, H5AC_WRITE)))
+    /* Pin the free space header into memory */
+    if(NULL == (ret_value = H5FS_pin(f, dxpl_id, *fs_addr, nclasses, classes, cls_init_udata)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space header")
 
-    /* Point free space wrapper at header and pin it in the cache */
-    fspace->hdr = fs_hdr;
-    if(H5AC_pin_protected_entry(f, fs_hdr) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, NULL, "unable to pin free space header")
-
-    /* Unlock free space header, now pinned */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fspace->addr, fs_hdr, H5AC__NO_FLAGS_SET) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space header")
-    fs_hdr = NULL;
-
-    /* Set modifiable free space parameters */
-    fspace->nbins = H5V_log2_gen(fspace->hdr->max_sect_size);
-    fspace->sect_prefix_size = H5FS_SECTS_PREFIX_SIZE(f);
-    fspace->sect_off_size = (fspace->hdr->max_sect_addr + 7) / 8;
-    fspace->sect_len_size = (H5V_log2_gen(fspace->hdr->max_sect_size) + 7) / 8;
-    H5FS_init(fspace);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->nbins = %u\n", FUNC, fspace->nbins);
-HDfprintf(stderr, "%s: fspace->sect_off_size = %u, fspace->sect_len_size = %u\n", FUNC, fspace->sect_off_size, fspace->sect_len_size);
-#endif /* QAK */
-
-    /* Set current space used for free space sections (for no sections) */
-    fspace->hdr->sect_size = H5FS_serialize_size(fspace);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-#endif /* QAK */
-
-    /* Flag the free space as dirty */
-    fspace->dirty = TRUE;
-
-    /* Reset flag for deserializing the sections */
-    fspace->must_deserialize = FALSE;
-
-    /* Add the free space manager to the list of open free space managers */
-    if(H5FS_open_add(fspace) < 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space header to open list")
-
-    /* Set return value */
-    ret_value = fspace;
-
 done:
-    if(!ret_value) {
-        if(fspace)
-            if(H5FS_close(f, dxpl_id, fspace) < 0)
-                HDONE_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "unable to release free space info")
-    } /* end if */
+    if(!ret_value && fspace)
+        (void)H5FS_cache_hdr_dest(f, fspace);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_create() */
@@ -503,9 +227,6 @@ H5FS_t *
 H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr, size_t nclasses,
     const H5FS_section_class_t *classes[], void *cls_init_udata)
 {
-    H5FS_hdr_t *fs_hdr = NULL;  /* Free space header loaded from file */
-    H5FS_t *fspace = NULL;      /* New free space structure */
-    size_t u;                   /* Local index variable */
     H5FS_t *ret_value;          /* Return value */
 
     FUNC_ENTER_NOAPI(H5FS_open, NULL)
@@ -515,2371 +236,19 @@ HDfprintf(stderr, "%s: Opening free space manager\n", FUNC);
 
     /* Check arguments. */
     HDassert(H5F_addr_defined(fs_addr));
-    HDassert(nclasses == 0 || classes);
+    HDassert(nclasses);
+    HDassert(classes);
 
-    /* Allocate free space structure */
-    if(NULL == (fspace = H5FL_MALLOC(H5FS_t)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
-
-    /* Protect the free space header */
-    if(NULL == (fs_hdr = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, NULL, NULL, H5AC_READ)))
+    /* Pin the free space header (does all the work for opening) */
+    if(NULL == (ret_value = H5FS_pin(f, dxpl_id, fs_addr, nclasses, classes, cls_init_udata)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to protect free space header")
 
-    /* Point free space wrapper at header and pin it in the cache */
-    fspace->hdr = fs_hdr;
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", FUNC, fspace->hdr->tot_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->serial_sect_count = %Hu\n", FUNC, fspace->hdr->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->ghost_sect_count = %Hu\n", FUNC, fspace->hdr->ghost_sect_count);
-#endif /* QAK */
-    if(H5AC_pin_protected_entry(f, fs_hdr) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, NULL, "unable to pin free space header")
-
-    /* Release the free space header */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fs_hdr, H5AC__NO_FLAGS_SET) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space header")
-    fs_hdr = NULL;
-
-    /* Set immutable free list parameters */
-    fspace->addr = fs_addr;
-    HDassert(fspace->hdr->nclasses == nclasses);
-    if(NULL == (fspace->sect_cls = H5FL_SEQ_MALLOC(H5FS_section_class_t, nclasses)))
-	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section class array ")
-
-    /* Initialize the section classes for this free space list */
-    for(u = 0; u < nclasses; u++) {
-        /* Make certain that section class type can be used as an array index into this array */
-        HDassert(u == classes[u]->type);
-
-        /* Copy the class information into the free space manager */
-        HDmemcpy(&fspace->sect_cls[u], classes[u], sizeof(H5FS_section_class_t));
-
-        /* Call the class initialization routine, if there is one */
-        if(fspace->sect_cls[u].init_cls)
-            if((fspace->sect_cls[u].init_cls)(&fspace->sect_cls[u], cls_init_udata) < 0)
-                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "unable to initialize section class")
-    } /* end for */
-
-    /* Set modifiable free space parameters */
-    fspace->nbins = H5V_log2_gen(fspace->hdr->max_sect_size);
-    fspace->sect_prefix_size = H5FS_SECTS_PREFIX_SIZE(f);
-    fspace->sect_off_size = (fspace->hdr->max_sect_addr + 7) / 8;
-    fspace->sect_len_size = (H5V_log2_gen(fspace->hdr->max_sect_size) + 7) / 8;
-    H5FS_init(fspace);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->nbins = %u\n", FUNC, fspace->nbins);
-HDfprintf(stderr, "%s: fspace->sect_off_size = %u, fspace->sect_len_size = %u\n", FUNC, fspace->sect_off_size, fspace->sect_len_size);
-#endif /* QAK */
-
-    /* The free space is clean, currently */
-    fspace->dirty = FALSE;
-
-    /* Set flag for delayed deserialization appropriately */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_addr = %a\n", FUNC, fspace->hdr->sect_addr);
-#endif /* QAK */
-    if(fspace->hdr->serial_sect_count > 0) {
-        HDassert(H5F_addr_defined(fspace->hdr->sect_addr));
-        HDassert(fspace->hdr->sect_size > 0);
-        fspace->must_deserialize = TRUE;
-    } /* end if */
-    else
-        fspace->must_deserialize = FALSE;
-
-    /* Add the free space manager to the list of open free space managers */
-    if(H5FS_open_add(fspace) < 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space manager to open list")
-
-    /* Set return value */
-    ret_value = fspace;
-
 done:
-    if(!ret_value) {
-        if(fspace)
-            if(H5FS_close(f, dxpl_id, fspace) < 0)
-                HDONE_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "unable to release free space info")
-    } /* end if */
-
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_open() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_sect_increase
- *
- * Purpose:	Increase the size of the serialized free space section info
- *              on disk
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_increase(H5FS_t *fspace, const H5FS_section_class_t *cls)
-{
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_increase)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(fspace->hdr);
-    HDassert(cls);
-
-    /* Increment total # of sections on free space list */
-    fspace->hdr->tot_sect_count++;
-
-    /* Check for serializable or 'ghost' section */
-    if(cls->flags & H5FS_CLS_GHOST_OBJ)
-        fspace->hdr->ghost_sect_count++;
-    else {
-        fspace->hdr->serial_sect_count++;
-
-        /* Update the free space sections' serialized size */
-        fspace->hdr->sect_size = H5FS_serialize_size(fspace);
-    } /* end else */
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5FS_sect_increase() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_decrease
- *
- * Purpose:	Decrease the size of the serialized free space section info
- *              on disk
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_decrease(H5FS_t *fspace, const H5FS_section_class_t *cls)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_decrease)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(fspace->hdr);
-    HDassert(cls);
-
-    /* Decrement total # of sections in free space manager */
-    fspace->hdr->tot_sect_count--;
-    if(cls->flags & H5FS_CLS_GHOST_OBJ)
-        fspace->hdr->ghost_sect_count--;
-    else
-        fspace->hdr->serial_sect_count--;
-
-    /* Check for sections to manage */
-    if(fspace->hdr->tot_sect_count > 0) {
-        /* Drop back to using a "single" node when there's only one section */
-        if(fspace->hdr->tot_sect_count == 1) {
-            H5FS_node_t *fspace_node;       /* Free list size node */
-            H5FS_section_info_t *sect;      /* Section to move to 'single' info */
-            unsigned bin;                   /* Bin with node */
-            unsigned u;                     /* Local index variable */
-
-            /* Sanity check */
-            HDassert(fspace->single == NULL);
-            HDassert(fspace->tot_size_count == 1);
-
-            /* Search for the bin with the node */
-            for(u = 0; u < fspace->nbins; u++)
-                if(fspace->bins[u].tot_sect_count) {
-                    /* Sanity check section size count for bin */
-                    HDassert(H5SL_count(fspace->bins[u].bin_list) == 1);
-                    HDassert(fspace->bins[u].tot_sect_count == 1);
-                    HDassert((fspace->bins[u].serial_sect_count +
-                            fspace->bins[u].ghost_sect_count) == 1);
-
-                    /* Save bin index & get out */
-                    bin = u;
-                    break;
-                } /* end if */
-#ifndef NDEBUG
-            /* Sanity check rest of bins */
-            for(u++; u < fspace->nbins; u++) {
-                HDassert(fspace->bins[u].tot_sect_count == 0);
-                HDassert(fspace->bins[u].serial_sect_count == 0);
-                HDassert(fspace->bins[u].ghost_sect_count == 0);
-            } /* end for */
-#endif /* NDEBUG */
-
-            /* Remove the free space section size node from the bin list */
-            if(NULL == (fspace_node = H5SL_remove_first(fspace->bins[bin].bin_list)))
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space section size node from skip list")
-
-            /* Decrement # of section sizes in bin */
-            fspace->bins[bin].tot_sect_count = 0;
-            fspace->bins[bin].serial_sect_count = 0;
-            fspace->bins[bin].ghost_sect_count = 0;
-
-            /* Make certain there's only one section of this size */
-            HDassert(H5SL_count(fspace_node->sect_list) == 1);
-            HDassert((fspace_node->serial_count + fspace_node->ghost_count) == 1);
-            HDassert((fspace->hdr->serial_sect_count + fspace->hdr->ghost_sect_count) == 1);
-
-            /* Remove the free space section from the section size list */
-            if(NULL == (sect = H5SL_remove_first(fspace_node->sect_list)))
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space section from skip list")
-
-            /* Destroy skip list for size tracking node */
-            if(H5SL_close(fspace_node->sect_list) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy size tracking node's skip list")
-
-            /* Release free space list node */
-            H5FL_FREE(H5FS_node_t, fspace_node);
-
-            /* Capture single section's information */
-            fspace->single = sect;
-        } /* end if */
-
-        /* Update the free space sections' serialized size */
-        if(!(cls->flags & H5FS_CLS_GHOST_OBJ))
-            fspace->hdr->sect_size = H5FS_serialize_size(fspace);
-    } /* end if */
-    else
-        fspace->hdr->sect_size = 0;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_decrease() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_remove_size_node
- *
- * Purpose:	Remove a section size node from size tracking data structures for
- *              a free space manager
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_size_node_decr(H5FS_t *fspace, unsigned bin, H5FS_node_t *fspace_node,
-    const H5FS_section_class_t *cls)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_size_node_decr)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(fspace_node);
-    HDassert(cls);
-
-    /* Decrement the # of sections in this bin */
-    /* (Different from the # of items in the bin's skiplist, since each node on
-     *  the bin's skiplist is also a skiplist...)
-     */
-    fspace->bins[bin].tot_sect_count--;
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->bins[%u].sect_count = %Zu\n", FUNC, bin, fspace->bins[bin].sect_count);
-#endif /* QAK */
-
-    /* Check for 'ghost' or 'serializable' section */
-    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
-        /* Decrement node's ghost section count */
-        fspace_node->ghost_count--;
-
-        /* Decrement bin's ghost section count */
-        fspace->bins[bin].ghost_sect_count--;
-
-        /* If the node has no more ghost sections, decrement number of ghost section sizes managed */
-        if(fspace_node->ghost_count == 0)
-            fspace->ghost_size_count--;
-    } /* end if */
-    else {
-        /* Decrement node's serializable section count */
-        fspace_node->serial_count--;
-
-        /* Decrement bin's serializable section count */
-        fspace->bins[bin].serial_sect_count--;
-
-        /* If the node has no more serializable sections, decrement number of serializable section sizes managed */
-        if(fspace_node->serial_count == 0)
-            fspace->serial_size_count--;
-    } /* end else */
-
-    /* Check for no more nodes on list of that size */
-    if(H5SL_count(fspace_node->sect_list) == 0) {
-        H5FS_node_t *tmp_fspace_node;       /* Free space list size node */
-
-        /* Sanity checks */
-        HDassert(fspace_node->ghost_count == 0);
-        HDassert(fspace_node->serial_count == 0);
-
-        /* Remove size tracking list from bin */
-        tmp_fspace_node = H5SL_remove(fspace->bins[bin].bin_list, &fspace_node->sect_size);
-        if(tmp_fspace_node == NULL || tmp_fspace_node != fspace_node)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
-
-        /* Destroy skip list for size tracking node */
-        if(H5SL_close(fspace_node->sect_list) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy size tracking node's skip list")
-
-        /* Release free space list node */
-        H5FL_FREE(H5FS_node_t, fspace_node);
-
-        /* Decrement total number of section sizes managed */
-        fspace->tot_size_count--;
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_size_node_decr() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_unlink_size
- *
- * Purpose:	Remove a section node from size tracking data structures for
- *              a free space manager
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_unlink_size(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
-{
-    herr_t ret_value = SUCCEED;     /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_size)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(sect);
-    HDassert(cls);
-
-    /* Check for only a single section */
-    if(fspace->single) {
-        /* Verify that single section is correct */
-        if(H5F_addr_ne(fspace->single->addr, sect->addr))
-            HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't remove single section")
-
-        /* Reset 'single' section pointer */
-        fspace->single = NULL;
-
-        /* Reset number of section sizes */
-        fspace->tot_size_count = fspace->serial_size_count = fspace->ghost_size_count = 0;
-    } /* end if */
-    else {
-        H5FS_node_t *fspace_node;       /* Free list size node */
-        H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
-        unsigned bin;                   /* Bin to put the free space section in */
-
-        /* Sanity check */
-        HDassert(fspace->bins);
-
-        /* Determine correct bin which holds items of at least the section's size */
-        bin = H5V_log2_gen(sect->size);
-        HDassert(bin < fspace->nbins);
-        if(fspace->bins[bin].bin_list == NULL)
-            HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "node's bin is empty?")
-
-        /* Find space node for section's size */
-        if((fspace_node = H5SL_search(fspace->bins[bin].bin_list, &sect->size)) == NULL)
-            HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section size node")
-
-        /* Remove the section's node from the list */
-        tmp_sect_node = H5SL_remove(fspace_node->sect_list, &sect->addr);
-        if(tmp_sect_node == NULL || tmp_sect_node != sect)
-            HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
-
-        /* Decrement # of sections in section size node */
-        if(H5FS_size_node_decr(fspace, bin, fspace_node, cls) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
-    } /* end else */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_unlink_size() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_unlink_rest
- *
- * Purpose:	Finish unlinking a section from the rest of the free space
- *              manager's data structures, after the section has been removed
- *              from the size tracking data structures
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_unlink_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    const H5FS_section_class_t *cls, H5FS_section_info_t *sect)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_rest)
-
-    /* Check arguments. */
-    HDassert(f);
-    HDassert(fspace);
-    HDassert(cls);
-    HDassert(sect);
-
-    /* Remove node from merge list, if it was entered there */
-    if(!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
-        H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
-
-#ifdef QAK
-HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
-#endif /* QAK */
-        tmp_sect_node = H5SL_remove(fspace->merge_list, &sect->addr);
-        if(tmp_sect_node == NULL || tmp_sect_node != sect)
-            HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
-    } /* end if */
-
-    /* Decrement amount of space required to serialize all sections */
-    fspace->serial_size -= fspace->sect_cls[sect->type].serial_size;
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
-HDfprintf(stderr, "%s: fspace->serial_size = %Zu\n", FUNC, fspace->serial_size);
-HDfprintf(stderr, "%s: fspace->sect_cls[%u].serial_size = %Zu\n", FUNC, sect->type, fspace->sect_cls[sect->type].serial_size);
-#endif /* QAK */
-
-    /* Update section info & check if we need less room for the serialized free space sections */
-    if(H5FS_sect_decrease(fspace, cls) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't increase free space section size on disk")
-
-    /* Decrement amount of free space managed */
-    fspace->hdr->tot_space -= sect->size;
-
-    /* Mark free space sections as changed */
-    fspace->dirty = TRUE;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_unlink_rest() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_remove
- *
- * Purpose:	Remove a section from the free space manager
- *
- * Return:	Success:	non-negative
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FS_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect)
-{
-    const H5FS_section_class_t *cls;    /* Class of section */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_remove)
-
-    /* Check arguments. */
-    HDassert(f);
-    HDassert(fspace);
-    HDassert(sect);
-
-    /* Get section's class */
-    cls = &fspace->sect_cls[sect->type];
-
-    /* Remove node from size tracked data structures */
-    if(H5FS_sect_unlink_size(fspace, cls, sect) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from size tracking data structures")
-
-    /* Update rest of free space manager data structures for node removal */
-    if(H5FS_sect_unlink_rest(f, dxpl_id, fspace, cls, sect) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_remove() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_link_size_bin
- *
- * Purpose:	Add a section of free space to the free list bins
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, March 20, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_link_size_bin(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
-{
-    H5FS_node_t *fspace_node = NULL;     /* Pointer to free space node of the correct size */
-    unsigned bin;                       /* Bin to put the free space section in */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_size_bin)
-#ifdef QAK
-HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, sect->addr);
-#endif /* QAK */
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(sect);
-    HDassert(H5F_addr_defined(sect->addr));
-    HDassert(sect->size);
-
-    /* Determine correct bin which holds items of the section's size */
-    bin = H5V_log2_gen(sect->size);
-    HDassert(bin < fspace->nbins);
-    if(fspace->bins[bin].bin_list == NULL) {
-        if(NULL == (fspace->bins[bin].bin_list = H5SL_create(H5SL_TYPE_HSIZE, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for free space nodes")
-    } /* end if */
-    else {
-        /* Check for node list of the correct size already */
-        fspace_node = H5SL_search(fspace->bins[bin].bin_list, &sect->size);
-    } /* end else */
-
-    /* Check if we need to create a new skip list for nodes of this size */
-    if(fspace_node == NULL) {
-        /* Allocate new free list size node */
-        if(NULL == (fspace_node = H5FL_MALLOC(H5FS_node_t)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for free space node")
-
-        /* Initialize the free list size node */
-        fspace_node->sect_size = sect->size;
-        fspace_node->serial_count = fspace_node->ghost_count = 0;
-        if(NULL == (fspace_node->sect_list = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for free space nodes")
-
-        /* Insert new free space size node into bin's list */
-        if(H5SL_insert(fspace->bins[bin].bin_list, fspace_node, &fspace_node->sect_size) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
-
-        /* Increment number of section sizes */
-        fspace->tot_size_count++;
-    } /* end if */
-
-    /* Increment # of section in bin */
-    /* (Different from the # of items in the bin's skiplist, since each node on
-     *  the bin's skiplist is also a skiplist...)
-     */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->bins[%u].sect_count = %Zu\n", FUNC, bin, fspace->bins[bin].sect_count);
-#endif /* QAK */
-    fspace->bins[bin].tot_sect_count++;
-    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
-        fspace->bins[bin].ghost_sect_count++;
-        fspace_node->ghost_count++;
-
-        /* Check for first ghost section in node */
-        if(fspace_node->ghost_count == 1)
-            fspace->ghost_size_count++;
-    } /* end if */
-    else {
-        fspace->bins[bin].serial_sect_count++;
-        fspace_node->serial_count++;
-
-        /* Check for first serializable section in node */
-        if(fspace_node->serial_count == 1)
-            fspace->serial_size_count++;
-    } /* end else */
-
-    /* Insert free space node into correct skip list */
-    if(H5SL_insert(fspace_node->sect_list, sect, &sect->addr) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_link_size_bin() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_link_size
- *
- * Purpose:	Link a section into size tracking data structures
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_link_size(H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_size)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(sect);
-
-    /* Check for special cases of # of sections on free list */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->tot_size_count = %Zu\n", FUNC, fspace->tot_size_count);
-HDfprintf(stderr, "%s: fspace->serial_size_count = %Zu\n", FUNC, fspace->serial_size_count);
-HDfprintf(stderr, "%s: fspace->ghost_size_count = %Zu\n", FUNC, fspace->ghost_size_count);
-#endif /* QAK */
-    if(fspace->hdr->tot_sect_count == 0) {
-        HDassert(fspace->single == NULL);
-
-        /* Capture single section's information */
-        fspace->single = sect;
-
-        /* Increment number of section sizes */
-        HDassert(fspace->tot_size_count == 0);
-        HDassert(fspace->serial_size_count == 0);
-        HDassert(fspace->ghost_size_count == 0);
-        fspace->tot_size_count = 1;
-        if(cls->flags & H5FS_CLS_GHOST_OBJ)
-            fspace->ghost_size_count = 1;
-        else
-            fspace->serial_size_count = 1;
-    } /* end if */
-    else {
-        /* Have a single section, put it into the bins */
-         if(fspace->single) {
-            const H5FS_section_class_t *single_cls;    /* Single section's class */
-
-            /* Check if we should allocate the bins */
-            if(fspace->bins == NULL)
-                /* Allocate the bins for free space sizes */
-                if(NULL == (fspace->bins = H5FL_SEQ_CALLOC(H5FS_bin_t, fspace->nbins)))
-                    HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for free space bins")
-
-            /* Get single section's class */
-            single_cls = &fspace->sect_cls[fspace->single->type];
-
-            /* Insert the current single section into the bins */
-            if(H5FS_sect_link_size_bin(fspace, single_cls, fspace->single) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
-            fspace->single = NULL;
-
-            /* Decrement number of section sizes */
-            /* (from increment in H5FS_sect_link_size_bin for inserting the single section) */
-            fspace->tot_size_count--;
-            if(single_cls->flags & H5FS_CLS_GHOST_OBJ)
-                fspace->ghost_size_count--;
-            else
-                fspace->serial_size_count--;
-#ifdef QAK
-HDfprintf(stderr, "%s: After adjusting single section\n", FUNC);
-HDfprintf(stderr, "%s: fspace->tot_size_count = %Zu\n", FUNC, fspace->tot_size_count);
-HDfprintf(stderr, "%s: fspace->serial_size_count = %Zu\n", FUNC, fspace->serial_size_count);
-HDfprintf(stderr, "%s: fspace->ghost_size_count = %Zu\n", FUNC, fspace->ghost_size_count);
-#endif /* QAK */
-        } /* end if */
-        HDassert(fspace->single == NULL);
-
-        /* Put new section into bins */
-        if(H5FS_sect_link_size_bin(fspace, cls, sect) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
-    } /* end else */
-
-done:
-#ifdef QAK
-HDfprintf(stderr, "%s: Leaving\n", FUNC);
-HDfprintf(stderr, "%s: fspace->tot_size_count = %Zu\n", FUNC, fspace->tot_size_count);
-HDfprintf(stderr, "%s: fspace->serial_size_count = %Zu\n", FUNC, fspace->serial_size_count);
-HDfprintf(stderr, "%s: fspace->ghost_size_count = %Zu\n", FUNC, fspace->ghost_size_count);
-#endif /* QAK */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_link_size() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_link_rest
- *
- * Purpose:	Link a section into the rest of the non-size tracking
- *              free space manager data structures
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_link_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, const H5FS_section_class_t *cls,
-    H5FS_section_info_t *sect)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_rest)
-
-    /* Check arguments. */
-    HDassert(f);
-    HDassert(fspace);
-    HDassert(sect);
-
-    /* Add section to the address-ordered list of sections, if allowed */
-    if(!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
-#ifdef QAK
-HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
-#endif /* QAK */
-        if(fspace->merge_list == NULL)
-            if(NULL == (fspace->merge_list = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for merging free space sections")
-        if(H5SL_insert(fspace->merge_list, sect, &sect->addr) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into merging skip list")
-    } /* end if */
-
-    /* Increment amount of space required to serialize all sections */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->serial_size = %Zu\n", FUNC, fspace->serial_size);
-HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
-#endif /* QAK */
-    fspace->serial_size += cls->serial_size;
-
-    /* Update section info & check if we need more room for the serialized free space sections */
-    if(H5FS_sect_increase(fspace, cls) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't increase free space section size on disk")
-
-    /* Increment amount of free space managed */
-    fspace->hdr->tot_space += sect->size;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_link_rest() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_link
- *
- * Purpose:	Link a section into the internal data structures
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_link(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t *sect)
-{
-    const H5FS_section_class_t *cls;    /* Class of section */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link)
-
-    /* Check arguments. */
-    HDassert(f);
-    HDassert(fspace);
-    HDassert(sect);
-
-    /* Get section's class */
-    cls = &fspace->sect_cls[sect->type];
-
-    /* Add section to size tracked data structures */
-#ifdef QAK
-HDfprintf(stderr, "%s: Check 1.0 - fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
-#endif /* QAK */
-    if(H5FS_sect_link_size(fspace, cls, sect) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to size tracking data structures")
-
-#ifdef QAK
-HDfprintf(stderr, "%s: Check 2.0 - fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
-#endif /* QAK */
-    /* Update rest of free space manager data structures for section addition */
-    if(H5FS_sect_link_rest(f, dxpl_id, fspace, cls, sect) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to non-size tracking data structures")
-#ifdef QAK
-HDfprintf(stderr, "%s: Check 3.0 - fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
-#endif /* QAK */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_link() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_merge
- *
- * Purpose:	Attempt to merge a returned free space section with existing
- *              free space.
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Wednesday, May 17, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_merge(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
-    H5FS_section_info_t **sect, void *op_data)
-{
-    H5FS_section_class_t *sect_cls;     /* Section's class */
-    H5FS_section_info_t *tmp_sect_node; /* Temporary free space section */
-    hbool_t modified;                   /* Flag to indicate merge or shrink occurred */
-    htri_t status;                      /* Status value */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_merge)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(*sect);
-    HDassert(H5F_addr_defined((*sect)->addr));
-    HDassert((*sect)->size);
-
-    /* Loop until no more merging */
-    if(fspace->merge_list) {
-        do {
-            H5FS_section_class_t *tmp_sect_cls;     /* Temporary section's class */
-
-            /* Reset 'modification occurred' flag */
-            modified = FALSE;
-
-            /* Look for neighboring section before new section */
-            tmp_sect_node = H5SL_less(fspace->merge_list, &(*sect)->addr);
-
-            /* Check for node before new node able to merge with new node */
-            if(tmp_sect_node) {
-                /* Get classes for right & left sections */
-                tmp_sect_cls = &fspace->sect_cls[tmp_sect_node->type];
-                sect_cls = &fspace->sect_cls[(*sect)->type];
-
-                /* Check if sections of the left most class can merge with sections
-                 *  of another class & whether the sections are the same type,
-                 *  then check for 'can merge' callback
-                 */
-                if((!(tmp_sect_cls->flags & H5FS_CLS_MERGE_SYM) || (tmp_sect_node->type == (*sect)->type))
-                        && tmp_sect_cls->can_merge) {
-                    /* Determine if the sections can merge */
-                    if((status = (*tmp_sect_cls->can_merge)(tmp_sect_node, *sect, op_data)) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for merging sections")
-                    if(status > 0) {
-                        /* Sanity check */
-                        HDassert(tmp_sect_cls->merge);
-
-                        /* Remove 'less than' node from data structures */
-                        if(H5FS_remove(f, dxpl_id, fspace, tmp_sect_node) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
-
-                        /* Merge the two sections together */
-                        if((*tmp_sect_cls->merge)(tmp_sect_node, *sect, op_data) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
-
-                        /* Retarget section pointer to 'less than' node that was merged into */
-                        *sect = tmp_sect_node;
-
-                        /* Indicate successful merge occurred */
-                        modified = TRUE;
-                    } /* end if */
-                } /* end if */
-            } /* end if */
-
-            /* Look for section after new (or merged) section */
-            tmp_sect_node = H5SL_greater(fspace->merge_list, &(*sect)->addr);
-
-            /* Check for node after new node able to merge with new node */
-            if(tmp_sect_node) {
-                /* Get classes for right & left sections */
-                sect_cls = &fspace->sect_cls[(*sect)->type];
-                tmp_sect_cls = &fspace->sect_cls[tmp_sect_node->type];
-
-                /* Check if sections of the left most class can merge with sections
-                 *  of another class & whether the sections are the same type,
-                 *  then check for 'can merge' callback
-                 */
-                if((!(sect_cls->flags & H5FS_CLS_MERGE_SYM) || ((*sect)->type == tmp_sect_node->type))
-                        && sect_cls->can_merge) {
-
-                    /* Determine if the sections can merge */
-                    if((status = (*sect_cls->can_merge)(*sect, tmp_sect_node, op_data)) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for merging sections")
-                    if(status > 0) {
-                        /* Sanity check */
-                        HDassert(sect_cls->merge);
-
-                        /* Remove 'greater than' node from data structures */
-                        if(H5FS_remove(f, dxpl_id, fspace, tmp_sect_node) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
-
-                        /* Merge the two sections together */
-                        if((*sect_cls->merge)(*sect, tmp_sect_node, op_data) < 0)
-                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
-
-                        /* Indicate successful merge occurred */
-                        modified = TRUE;
-                    } /* end if */
-                } /* end if */
-            } /* end if */
-        } while(modified);
-    } /* end if */
-    HDassert(*sect);
-#ifdef QAK
-HDfprintf(stderr, "%s: Done merging, (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size, (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
-#endif /* QAK */
-
-    /* Loop until no more shrinking */
-    do {
-        /* Reset 'modification occurred' flag */
-        modified = FALSE;
-
-        /* Check for (possibly merged) section able to shrink the size of the container */
-        sect_cls = &fspace->sect_cls[(*sect)->type];
-        if(sect_cls->can_shrink) {
-            if((status = (*sect_cls->can_shrink)(*sect, op_data)) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking container")
-            if(status > 0) {
-#ifdef QAK
-HDfprintf(stderr, "%s: Can shrink!\n", FUNC);
-#endif /* QAK */
-                /* Look for neighboring section before new section */
-                if(fspace->merge_list) {
-                    tmp_sect_node = H5SL_less(fspace->merge_list, &(*sect)->addr);
-
-                    /* Make certain there isn't a section after the new section */
-                    HDassert(H5SL_greater(fspace->merge_list, &(*sect)->addr) == NULL);
-                } /* end if */
-                else
-                    tmp_sect_node = NULL;
-
-                /* Shrink the container */
-                /* (callback can indicate that it has discarded the section by setting *sect to NULL) */
-                HDassert(sect_cls->shrink);
-                if((*sect_cls->shrink)(sect, op_data) < 0)
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't shrink free space container")
-
-                /* Check if the new section was removed */
-                if(*sect == NULL && tmp_sect_node) {
-                    /* Remove 'less than' node from data structures */
-                    if(H5FS_remove(f, dxpl_id, fspace, tmp_sect_node) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
-
-                    *sect = tmp_sect_node;
-                } /* end if */
-
-                /* Indicate successful merge occurred */
-                modified = TRUE;
-            } /* end if */
-        } /* end if */
-    } while(modified && *sect);
-#ifdef QAK
-HDfprintf(stderr, "%s: Done shrinking\n", FUNC);
-if(*sect)
-    HDfprintf(stderr, "%s: (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size, (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
-else
-    HDfprintf(stderr, "%s: *sect = %p\n", FUNC, *sect);
-#endif /* QAK */
-
-done:
-#ifdef QAK
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
-#endif /* QAK */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_merge() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_add
- *
- * Purpose:	Add a section of free space to the free list
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, March  7, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FS_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect,
-    unsigned flags, void *op_data)
-{
-    H5FS_section_class_t *cls;          /* Section's class */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FS_add, FAIL)
-
-#ifdef QAK
-HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->size, sect->type, (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
-#endif /* QAK */
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(sect);
-    HDassert(H5F_addr_defined(sect->addr));
-    HDassert(sect->size);
-
-    /* Check if we need to go deserialize the sections */
-    if(fspace->must_deserialize) {
-        fspace->must_deserialize = FALSE;
-        if(H5FS_deserialize_bins(f, dxpl_id, fspace) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't deserialize sections")
-    } /* end if */
-
-    /* Call "add" section class callback, if there is one */
-    cls = &fspace->sect_cls[sect->type];
-    if(cls->add) {
-        if((*cls->add)(sect, &flags, op_data) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "'add' section class callback failed")
-    } /* end if */
-
-    /* Check for merging returned space with existing section node */
-    if(flags & H5FS_ADD_RETURNED_SPACE) {
-#ifdef QAK
-HDfprintf(stderr, "%s: Returning space\n", FUNC);
-#endif /* QAK */
-
-        /* Attempt to merge returned section with existing sections */
-        if(H5FS_sect_merge(f, dxpl_id, fspace, &sect, op_data) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't merge sections")
-    } /* end if */
-
-    /* Add new (possibly merged) node to free sections data structures */
-    /* (If section has been completely merged away or discarded, 'sect' will
-     *  be NULL at this point - QAK)
-     */
-    if(sect)
-        if(H5FS_sect_link(f, dxpl_id, fspace, sect) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
-
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
-#endif /* QAK */
-    /* Mark free space sections as changed */
-    /* (if we're not deserializing all the sections) */
-    if(!(flags & H5FS_ADD_DESERIALIZING))
-        fspace->dirty = TRUE;
-
-done:
-#ifdef H5FS_DEBUG
-if(!(flags & (H5FS_ADD_DESERIALIZING | H5FS_ADD_SKIP_VALID)))
-    H5FS_assert(fspace);
-#endif /* H5FS_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_add() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_find_bin_node
- *
- * Purpose:	Locate a section of free space (in existing free space list
- *              bins) that is large enough to fulfill request.
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, March 20, 2006
- *
- *-------------------------------------------------------------------------
- */
-static htri_t
-H5FS_find_bin_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
-{
-    H5FS_node_t *fspace_node;        /* Free list size node */
-    unsigned bin;                   /* Bin to put the free space section in */
-    htri_t ret_value = FALSE;       /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_find_bin_node)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(fspace->bins);
-    HDassert(request > 0);
-    HDassert(node);
-
-    /* Determine correct bin which holds items of at least the section's size */
-    bin = H5V_log2_gen(request);
-    HDassert(bin < fspace->nbins);
-    while(bin < fspace->nbins && fspace->bins[bin].bin_list == NULL)
-        bin++;
-
-    /* Find the first free space section that is large enough to fulfill request */
-    /* (Since the bins use skip lists to track the sizes of the address-ordered
-     *  lists, this is actually a "best fit" algorithm)
-     */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->nbins = %u\n", FUNC, fspace->nbins);
-HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
-#endif /* QAK */
-    if(bin < fspace->nbins)
-        do {
-            /* Look for large enough free space section in this bin */
-            if(fspace->bins[bin].bin_list)
-                /* Check for large enough list of sections on list */
-                if((fspace_node = H5SL_greater(fspace->bins[bin].bin_list, &request))) {
-                    const H5FS_section_class_t *cls;    /* Class of section */
-
-                    /* Take first node off of the list (ie. node w/lowest address) */
-                    if(NULL == (*node = H5SL_remove_first(fspace_node->sect_list)))
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
-
-                    /* Get section's class */
-                    cls = &fspace->sect_cls[(*node)->type];
-
-                    /* Decrement # of sections in section size node */
-                    if(H5FS_size_node_decr(fspace, bin, fspace_node, cls) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
-
-                    /* Indicate that we found a node for the request */
-                    HGOTO_DONE(TRUE)
-                } /* end if */
-
-            /* Advance to next larger bin */
-            bin++;
-        } while(bin < fspace->nbins);
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_find_bin_node() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_find
- *
- * Purpose:	Locate a section of free space (in existing free space list) that
- *              is large enough to fulfill request.
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, March  7, 2006
- *
- *-------------------------------------------------------------------------
- */
-htri_t
-H5FS_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
-{
-    htri_t ret_value = FALSE;           /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FS_find, FAIL)
-
-#ifdef QAK
-HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
-#endif /* QAK */
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(request);
-    HDassert(node);
-
-    /* Check if we need to go deserialize the sections */
-    if(fspace->must_deserialize) {
-        fspace->must_deserialize = FALSE;
-        if(H5FS_deserialize_bins(f, dxpl_id, fspace) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't deserialize sections")
-    } /* end if */
-
-    /* Check for any sections on free space list */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", FUNC, fspace->hdr->tot_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->serial_sect_count = %Hu\n", FUNC, fspace->hdr->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->ghost_sect_count = %Hu\n", FUNC, fspace->hdr->ghost_sect_count);
-#endif /* QAK */
-    if(fspace->hdr->tot_sect_count > 0) {
-        /* Check for single section */
-        if(fspace->single) {
-            /* See if single section is large enough */
-            if(fspace->single->size >= request) {
-                /* 'single' section fulfills request */
-                *node = fspace->single;
-                fspace->single = NULL;
-
-                /* Decrement number of section sizes */
-                fspace->tot_size_count = 0;
-                fspace->serial_size_count = fspace->ghost_size_count = 0;
-
-                /* Found a good section */
-                ret_value = TRUE;
-            } /* end if */
-            else
-                HGOTO_DONE(FALSE)
-        } /* end if */
-        else {
-            /* Look for node in bins */
-            if((ret_value = H5FS_find_bin_node(fspace, request, node)) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from bins")
-        } /* end else */
-
-        /* Decrement # of sections on free list, if we found an object */
-        if(ret_value > 0) {
-            const H5FS_section_class_t *cls;    /* Class of section */
-
-            /* Get section's class */
-            cls = &fspace->sect_cls[(*node)->type];
-
-            /* Update rest of free space manager data structures for node removal */
-            if(H5FS_sect_unlink_rest(f, dxpl_id, fspace, cls, *node) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
-#ifdef QAK
-HDfprintf(stderr, "%s: (*node)->size = %Hu, (*node)->addr = %a, (*node)->type = %u\n", FUNC, (*node)->size, (*node)->addr, (*node)->type);
-#endif /* QAK */
-        } /* end if */
-    } /* end if */
-
-done:
-#ifdef H5FS_DEBUG
-    H5FS_assert(fspace);
-#endif /* H5FS_DEBUG */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_find() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_free_cb
- *
- * Purpose:	Free a size-tracking node for a bin
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Saturday, March 11, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_sect_free_cb(void *_sect, void UNUSED *key, void *op_data)
-{
-    H5FS_section_info_t *sect = (H5FS_section_info_t *)_sect;   /* Section to free */
-    const H5FS_t *fspace = (const H5FS_t *)op_data;     /* Free space manager for section */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_free_cb)
-
-    HDassert(sect);
-    HDassert(fspace);
-
-    /* Call the 'free' method for the section's class */
-    (*fspace->sect_cls[sect->type].free)(sect);
-
-    FUNC_LEAVE_NOAPI(0)
-}   /* H5FS_sect_free_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_node_free_cb
- *
- * Purpose:	Free a size-tracking node for a bin
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Saturday, March 11, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_node_free_cb(void *item, void UNUSED *key, void *op_data)
-{
-    H5FS_node_t *fspace_node = (H5FS_node_t *)item;       /* Temporary pointer to free space list node */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_node_free_cb)
-
-    HDassert(fspace_node);
-    HDassert(op_data);
-
-    /* Release the skip list for sections of this size */
-    H5SL_destroy(fspace_node->sect_list, H5FS_sect_free_cb, op_data);
-
-    /* Release free space list node */
-    H5FL_FREE(H5FS_node_t, fspace_node);
-
-    FUNC_LEAVE_NOAPI(0)
-}   /* H5FS_node_free_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_serialize_sect_cb
- *
- * Purpose:	Skip list iterator callback to serialize free space sections
- *              of a particular size
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_serialize_sect_cb(void *_item, void UNUSED *key, void *_udata)
-{
-    H5FS_section_class_t *sect_cls;     /* Class of section */
-    H5FS_section_info_t *sect= (H5FS_section_info_t *)_item;   /* Free space section to work on */
-    H5FS_iter_ud2_t *udata = (H5FS_iter_ud2_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_serialize_sect_cb)
-
-    /* Check arguments. */
-    HDassert(sect);
-    HDassert(udata->fspace);
-    HDassert(udata->p);
-
-    /* Get section's class */
-    sect_cls = &udata->fspace->sect_cls[sect->type];
-
-    /* Check if this section should be serialized (i.e. is not a ghost section) */
-    if(!(sect_cls->flags & H5FS_CLS_GHOST_OBJ)) {
-        /* The address of the section */
-        UINT64ENCODE_VAR(*udata->p, sect->addr, udata->fspace->sect_off_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: sect->addr = %a\n", FUNC, sect->addr);
-#endif /* QAK */
-
-        /* The type of this section */
-        *(*udata->p)++ = (uint8_t)sect->type;
-#ifdef QAK
-HDfprintf(stderr, "%s: sect->type = %u\n", FUNC, (unsigned)sect->type);
-#endif /* QAK */
-
-        /* Call 'serialize' callback for this section */
-        if(sect_cls->serialize) {
-            if((*sect_cls->serialize)(sect_cls, sect, *udata->p) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTSERIALIZE, FAIL, "can't syncronize section")
-
-            /* Update offset in serialization buffer */
-            (*udata->p) += sect_cls->serial_size;
-        } /* end if */
-        else
-            HDassert(sect_cls->serial_size == 0);
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_serialize_sect_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_serialize_node_cb
- *
- * Purpose:	Skip list iterator callback to serialize free space sections
- *              in a bin
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_serialize_node_cb(void *_item, void UNUSED *key, void *_udata)
-{
-    H5FS_node_t *fspace_node = (H5FS_node_t *)_item;   /* Free space size node to work on */
-    H5FS_iter_ud2_t *udata = (H5FS_iter_ud2_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_serialize_node_cb)
-
-    /* Check arguments. */
-    HDassert(fspace_node);
-    HDassert(udata->fspace);
-    HDassert(udata->p);
-
-    /* Check if this node has any serializable sections */
-    if(fspace_node->serial_count > 0) {
-        /* The number of serializable sections of this node's size */
-        UINT64ENCODE_VAR(*udata->p, fspace_node->serial_count, udata->sect_cnt_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace_node->serial_count = %Zu\n", FUNC, fspace_node->serial_count);
-#endif /* QAK */
-
-        /* The size of the sections for this node */
-        UINT64ENCODE_VAR(*udata->p, fspace_node->sect_size, udata->fspace->sect_len_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: sect_size = %Hu\n", FUNC, fspace_node->sect_size);
-#endif /* QAK */
-
-        /* Iterate through all the sections of this size */
-        HDassert(fspace_node->sect_list);
-        if(H5SL_iterate(fspace_node->sect_list, H5FS_serialize_sect_cb, udata) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section nodes")
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_serialize_node_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_serialize_size
- *
- * Purpose:	Determine serialized size of all sections in free space manager
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	(can't fail)
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static size_t
-H5FS_serialize_size(H5FS_t *fspace)
-{
-    size_t sect_buf_size;               /* Section buffer size */
-
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_serialize_size)
-
-    /* Check arguments. */
-    HDassert(fspace);
-
-    /* Compute the size of the buffer required to serialize all the sections */
-
-    /* Serialized sections prefix */
-    sect_buf_size = fspace->sect_prefix_size;
-
-    /* Count for each differently sized serializable section */
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->serial_size_count = %Zu\n", "H5FS_serialize_size", fspace->serial_size_count);
-HDfprintf(stderr, "%s: fspace->hdr->serial_sect_count = %Hu\n", "H5FS_serialize_size", fspace->hdr->serial_sect_count);
-#endif /* QAK */
-    sect_buf_size += fspace->serial_size_count * MAX(1, ((H5V_log2_gen(fspace->hdr->serial_sect_count) + 7) / 8));
-
-    /* Size for each differently sized serializable section */
-    sect_buf_size += fspace->serial_size_count * fspace->sect_len_size;
-
-    /* Offsets of each section in address space */
-    sect_buf_size += fspace->hdr->serial_sect_count * fspace->sect_off_size;
-
-    /* Class of each section */
-    sect_buf_size += fspace->hdr->serial_sect_count * 1;
-
-    /* Extra space required to serialize each section */
-    sect_buf_size += fspace->serial_size;
-
-    FUNC_LEAVE_NOAPI(sect_buf_size)
-} /* H5FS_serialize_size() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_serialize_bins
- *
- * Purpose:	Serialize all bins into proper form on disk
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_serialize_bins(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
-{
-    H5FS_iter_ud2_t udata;              /* User data for callbacks */
-    uint8_t *sect_buf = NULL;           /* Buffer for sections */
-    uint8_t *p;                         /* Pointer into raw data buffer */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_serialize_bins)
-
-    /* Check arguments. */
-    HDassert(f);
-    HDassert(fspace);
-    HDassert(fspace->dirty);
-
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_addr = %a\n", FUNC, fspace->hdr->sect_addr);
-HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", FUNC, fspace->hdr->tot_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->serial_sect_count = %Hu\n", FUNC, fspace->hdr->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->ghost_sect_count = %Hu\n", FUNC, fspace->hdr->ghost_sect_count);
-HDfprintf(stderr, "%s: fspace->serial_size = %Zu\n", FUNC, fspace->serial_size);
-HDfprintf(stderr, "%s: fspace->single = %p\n", FUNC, fspace->single);
-if(fspace->single)
-    HDfprintf(stderr, "%s: fspace->single = {%a, %Hu, %u, %s}\n", FUNC, fspace->single->addr, fspace->single->size, fspace->single->type, (fspace->single->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
-#endif /* QAK */
-
-    /* Check for no free sections */
-    if(fspace->hdr->serial_sect_count == 0) {
-        /* Check for existing serialized sections on disk to release */
-        if(H5F_addr_defined(fspace->hdr->sect_addr)) {
-            /* Free previous serialized sections disk space */
-#ifdef QAK
-HDfprintf(stderr, "%s: Releasing space for serialized sections\n", FUNC);
-#endif /* QAK */
-            if(H5MF_xfree(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, fspace->hdr->sect_addr, fspace->hdr->alloc_sect_size)<0)
-                HGOTO_ERROR(H5E_STORAGE, H5E_CANTFREE, FAIL, "unable to release free space sections")
-
-            /* Reset address and size of serialized sections on disk */
-            fspace->hdr->sect_addr = HADDR_UNDEF;
-            fspace->hdr->sect_size = 0;
-        } /* end if */
-    } /* end if */
-    else {
-        /* Check for no space on disk allocated for the serialized sections */
-        if(!H5F_addr_defined(fspace->hdr->sect_addr)) {
-            /* Compute size to store sections on disk */
-            fspace->hdr->alloc_sect_size = (size_t)fspace->hdr->sect_size * (double)fspace->hdr->expand_percent / 100.0;
-
-            /* Allocate space for the new serialized sections on disk */
-#ifdef QAK
-HDfprintf(stderr, "%s: Allocating space for serialized sections, fspace->hdr->alloc_sect_size = %Hu\n", FUNC, fspace->hdr->alloc_sect_size);
-#endif /* QAK */
-            if(HADDR_UNDEF == (fspace->hdr->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, fspace->hdr->alloc_sect_size)))
-                HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
-        } /* end if */
-        else {
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-HDfprintf(stderr, "%s: fspace->hdr->alloc_sect_size = %Hu\n", FUNC, fspace->hdr->alloc_sect_size);
-#endif /* QAK */
-            if(fspace->hdr->sect_size > fspace->hdr->alloc_sect_size) {
-                size_t new_size;                    /* New size of space for serialized sections */
-/* Currently, the old block data is "thrown away" after the space is reallocated,
- * so avoid data copy in H5MF_realloc() call by just free'ing the space and
- * allocating new space.
- *
- * This also keeps the file smaller, by freeing the space and then
- * allocating new space, instead of vice versa (in H5MF_realloc).
- *
- * QAK - 5/ 8/2006
- */
-                /* Free previous serialized sections disk space */
-                if(H5MF_xfree(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, fspace->hdr->sect_addr, fspace->hdr->alloc_sect_size)<0)
-                    HGOTO_ERROR(H5E_STORAGE, H5E_CANTFREE, FAIL, "unable to free free space sections")
-
-                /* Compute new size */
-                new_size = fspace->hdr->alloc_sect_size;
-                while(new_size < fspace->hdr->sect_size)
-                    new_size *= (double)fspace->hdr->expand_percent / 100.0;
-                fspace->hdr->alloc_sect_size = new_size;
-
-                /* Allocate space for the new serialized sections on disk */
-#ifdef QAK
-HDfprintf(stderr, "%s: Allocating space for larger serialized sections, fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-#endif /* QAK */
-                if(HADDR_UNDEF == (fspace->hdr->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, (hsize_t)fspace->hdr->alloc_sect_size)))
-                    HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
-            } /* end if */
-            else {
-                size_t decrease_threshold;          /* Size threshold for decreasing serialized section size */
-                hsize_t new_size;                   /* New size of space for serialized sections */
-
-                /* Compute the threshold for decreasing the sections' serialized size */
-                decrease_threshold = ((size_t)fspace->hdr->alloc_sect_size * (double)fspace->hdr->shrink_percent) / 100.0;
-
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-HDfprintf(stderr, "%s: fspace->hdr->alloc_sect_size = %Hu\n", FUNC, fspace->hdr->alloc_sect_size);
-#endif /* QAK */
-                if(fspace->hdr->alloc_sect_size > H5FS_SECT_SIZE_DEFAULT &&
-                        fspace->hdr->sect_size < decrease_threshold) {
-/* Currently, the old block data is "thrown away" after the space is reallocated,
- * so avoid data copy in H5MF_realloc() call by just free'ing the space and
- * allocating new space.
- *
- * This also keeps the file smaller, by freeing the space and then
- * allocating new space, instead of vice versa (in H5MF_realloc).
- *
- * QAK - 5/ 8/2006
- */
-                    /* Free previous serialized sections disk space */
-                    if(H5MF_xfree(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, fspace->hdr->sect_addr, fspace->hdr->alloc_sect_size)<0)
-                        HGOTO_ERROR(H5E_STORAGE, H5E_CANTFREE, FAIL, "unable to free free space sections")
-
-                    /* Compute new size */
-                    while(fspace->hdr->sect_size < decrease_threshold) {
-                        new_size = decrease_threshold;
-
-                        decrease_threshold *= (double)fspace->hdr->shrink_percent / 100.0;
-                    } /* end while */
-                    if(new_size < H5FS_SECT_SIZE_DEFAULT)
-                        new_size = H5FS_SECT_SIZE_DEFAULT;
-                    fspace->hdr->alloc_sect_size = new_size;
-
-                    /* Allocate space for the new serialized sections on disk */
-#ifdef QAK
-HDfprintf(stderr, "%s: Allocating space for smaller serialized sections\n", FUNC);
-#endif /* QAK */
-                    if(HADDR_UNDEF == (fspace->hdr->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, (hsize_t)fspace->hdr->alloc_sect_size)))
-                        HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
-                } /* end if */
-            } /* end else */
-        } /* end else */
-
-        /* Allocate space for the buffer to serialize the sections into */
-        if(NULL == (sect_buf = H5FL_BLK_MALLOC(sect_block, (size_t)fspace->hdr->sect_size)))
-            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
-        /* Serialize free sections into buffer available */
-        p = sect_buf;
-
-        /* Magic number */
-        HDmemcpy(p, H5FS_SECTS_MAGIC, H5FS_SIZEOF_MAGIC);
-        p += H5FS_SIZEOF_MAGIC;
-
-        /* Version # */
-        *p++ = H5FS_SECTS_VERSION;
-
-        /* Metadata status flags */
-/* XXX: Set this? */
-        *p++ = 0;
-
-        /* Metadata checksum */
-/* XXX: Set this!  (After all the metadata is in the buffer) */
-        HDmemset(p, 0, 4);
-        p += 4;
-
-        /* Address of free space header for these sections */
-        H5F_addr_encode(f, &p, fspace->addr);
-
-        /* Set up user data for iterator */
-        udata.fspace = fspace;
-        udata.p = &p;
-        udata.sect_cnt_size = MAX(1, (H5V_log2_gen(fspace->hdr->serial_sect_count) + 7) / 8);
-#ifdef QAK
-HDfprintf(stderr, "%s: udata.sect_cnt_size = %u\n", FUNC, udata.sect_cnt_size);
-#endif /* QAK */
-
-        /* Check for whether to serialize a single section */
-        if(fspace->single) {
-#ifdef QAK
-HDfprintf(stderr, "%s: Serializing single section\n", FUNC);
-#endif /* QAK */
-            /* The number of sections */
-            UINT64ENCODE_VAR(p, 1, udata.sect_cnt_size);
-
-            /* The size of the section */
-            UINT64ENCODE_VAR(p, fspace->single->size, fspace->sect_len_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->single->size = %Hu\n", FUNC, fspace->single->size);
-#endif /* QAK */
-
-            /* Serialize the single node */
-            if(H5FS_serialize_sect_cb(fspace->single, NULL, &udata) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTSERIALIZE, FAIL, "can't syncronize single section")
-        } /* end if */
-        else {
-            unsigned bin;           /* Current bin we are on */
-
-            /* Iterate over all the bins */
-#ifdef QAK
-HDfprintf(stderr, "%s: Serializing section bins\n", FUNC);
-#endif /* QAK */
-            for(bin = 0; bin < fspace->nbins; bin++) {
-                /* Check if there are any sections in this bin */
-                if(fspace->bins[bin].bin_list) {
-                    /* Iterate over list of section size nodes for bin */
-                    if(H5SL_iterate(fspace->bins[bin].bin_list, H5FS_serialize_node_cb, &udata) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section size nodes")
-                } /* end if */
-            } /* end for */
-        } /* end else */
-
-        /* Sanity check */
-        HDassert((size_t)(p - sect_buf) == fspace->hdr->sect_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-#endif /* QAK */
-
-        /* Write buffer to disk */
-        HDassert(fspace->hdr->sect_size <= fspace->hdr->alloc_sect_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->alloc_sect_size = %Hu\n", FUNC, fspace->hdr->alloc_sect_size);
-#endif /* QAK */
-        if(H5F_block_write(f, H5FD_MEM_FSPACE_SECTS, fspace->hdr->sect_addr, (size_t)fspace->hdr->sect_size, dxpl_id, sect_buf) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL, "unable to save free space sections to disk")
-    } /* end else */
-
-    /* Mark free space as clean now */
-    fspace->dirty = FALSE;
-
-done:
-    if(sect_buf)
-        H5FL_BLK_FREE(sect_block, sect_buf);
-
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_serialize_bins() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_deserialize_bins
- *
- * Purpose:	Deserialize all bins from disk
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_deserialize_bins(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
-{
-    haddr_t fs_addr;                    /* Free space header address */
-    uint32_t metadata_chksum;           /* Metadata checksum value */
-    uint8_t *sect_buf = NULL;           /* Buffer for sections */
-    const uint8_t *p;                   /* Pointer into raw data buffer */
-    size_t old_sect_size;               /* Section size */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_deserialize_bins)
-
-    /* Check arguments. */
-    HDassert(f);
-    HDassert(fspace);
-
-    /* Allocate space for the buffer to serialize the sections into */
-    old_sect_size = fspace->hdr->sect_size;
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
-#endif /* QAK */
-    if(NULL == (sect_buf = H5FL_BLK_MALLOC(sect_block, (size_t)fspace->hdr->sect_size)))
-        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
-
-    /* Read buffer from disk */
-    if(H5F_block_read(f, H5FD_MEM_FSPACE_SECTS, fspace->hdr->sect_addr, (size_t)fspace->hdr->sect_size, dxpl_id, sect_buf) < 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_READERROR, FAIL, "can't read free space sections")
-
-    /* Deserialize free sections from buffer available */
-    p = sect_buf;
-
-    /* Magic number */
-    if(HDmemcmp(p, H5FS_SECTS_MAGIC, H5FS_SIZEOF_MAGIC))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "wrong free space sections signature")
-    p += H5FS_SIZEOF_MAGIC;
-
-    /* Version */
-    if(*p++ != H5FS_SECTS_VERSION)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "wrong free space sections version")
-
-    /* Metadata flags (unused, currently) */
-/* XXX: Plan out metadata flags (including "read-only duplicate" feature) */
-    if(*p++ != 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unknown metadata flag in free space sections")
-
-    /* Metadata checksum (unused, currently) */
-    UINT32DECODE(p, metadata_chksum);
-/* XXX: Verify checksum */
-    if(metadata_chksum != 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "incorrect metadata checksum for free space sections")
-
-    /* Address of free space header for these sections */
-    H5F_addr_decode(f, &p, &fs_addr);
-    if(H5F_addr_ne(fs_addr, fspace->addr))
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "incorrect header address for free space sections")
-
-    /* Check for any serialized sections */
-    if(fspace->hdr->serial_sect_count > 0) {
-        hsize_t old_tot_sect_count;     /* Total section count from header */
-        hsize_t old_serial_sect_count;  /* Total serializable section count from header */
-        hsize_t old_ghost_sect_count;   /* Total ghost section count from header */
-        hsize_t old_tot_space;          /* Total space managed from header */
-        unsigned sect_cnt_size;         /* The size of the section size counts */
-
-        /* Compute the size of the section counts */
-        sect_cnt_size = MAX(1, (H5V_log2_gen(fspace->hdr->serial_sect_count) + 7) / 8);
-#ifdef QAK
-HDfprintf(stderr, "%s: sect_cnt_size = %u\n", FUNC, sect_cnt_size);
-HDfprintf(stderr, "%s: fspace->sect_len_size = %u\n", FUNC, fspace->sect_len_size);
-#endif /* QAK */
-
-        /* Reset the section count, the "add" routine will update it */
-        old_tot_sect_count = fspace->hdr->tot_sect_count;
-        old_serial_sect_count = fspace->hdr->serial_sect_count;
-        old_ghost_sect_count = fspace->hdr->ghost_sect_count;
-        old_tot_space = fspace->hdr->tot_space;
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", FUNC, fspace->hdr->tot_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->serial_sect_count = %Hu\n", FUNC, fspace->hdr->serial_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->ghost_sect_count = %Hu\n", FUNC, fspace->hdr->ghost_sect_count);
-HDfprintf(stderr, "%s: fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
-#endif /* QAK */
-        fspace->hdr->tot_sect_count = 0;
-        fspace->hdr->serial_sect_count = 0;
-        fspace->hdr->ghost_sect_count = 0;
-        fspace->hdr->tot_space = 0;
-
-        /* Walk through the buffer, deserializing sections */
-        do {
-            hsize_t sect_size;      /* Current section size */
-            size_t node_count;      /* # of sections of this size */
-            size_t u;               /* Local index variable */
-
-            /* The number of sections of this node's size */
-            UINT64DECODE_VAR(p, node_count, sect_cnt_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: node_count = %Zu\n", FUNC, node_count);
-#endif /* QAK */
-            HDassert(node_count);
-
-            /* The size of the sections for this node */
-            UINT64DECODE_VAR(p, sect_size, fspace->sect_len_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: sect_size = %Hu\n", FUNC, sect_size);
-#endif /* QAK */
-            HDassert(sect_size);
-
-            /* Loop over nodes of this size */
-            for(u = 0; u < node_count; u++) {
-                H5FS_section_info_t *new_sect;  /* Section that was deserialized */
-                haddr_t sect_addr;      /* Address of free space section in the address space */
-                unsigned sect_type;     /* Type of free space section */
-                unsigned des_flags;     /* Flags from deserialize callback */
-
-                /* The address of the section */
-                UINT64DECODE_VAR(p, sect_addr, fspace->sect_off_size);
-#ifdef QAK
-HDfprintf(stderr, "%s: sect_addr = %a\n", FUNC, sect_addr);
-#endif /* QAK */
-
-                /* The type of this section */
-                sect_type = *p++;
-#ifdef QAK
-HDfprintf(stderr, "%s: sect_type = %u\n", FUNC, sect_type);
-#endif /* QAK */
-
-                /* Call 'deserialize' callback for this section */
-                des_flags = 0;
-                HDassert(fspace->sect_cls[sect_type].deserialize);
-                if(NULL == (new_sect = (*fspace->sect_cls[sect_type].deserialize)(&fspace->sect_cls[sect_type], dxpl_id, p, sect_addr, sect_size, &des_flags)))
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't deserialize section")
-
-                /* Update offset in serialization buffer */
-                p += fspace->sect_cls[sect_type].serial_size;
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->sect_cls[%u].serial_size = %Zu\n", FUNC, sect_type, fspace->sect_cls[sect_type].serial_size);
-#endif /* QAK */
-
-                /* Insert section in free space manager, unless requested not to */
-                if(!(des_flags & H5FS_DESERIALIZE_NO_ADD))
-                    if(H5FS_add(f, dxpl_id, fspace, new_sect, H5FS_ADD_DESERIALIZING, NULL) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to free space manager")
-            } /* end for */
-        } while(p < (sect_buf + old_sect_size));
-
-        /* Sanity check */
-        HDassert((size_t)(p - sect_buf) == old_sect_size);
-        HDassert(old_sect_size == fspace->hdr->sect_size);
-        HDassert(old_tot_sect_count == fspace->hdr->tot_sect_count);
-        HDassert(old_serial_sect_count == fspace->hdr->serial_sect_count);
-        HDassert(old_ghost_sect_count == fspace->hdr->ghost_sect_count);
-        HDassert(old_tot_space == fspace->hdr->tot_space);
-    } /* end if */
-
-done:
-    if(sect_buf)
-        H5FL_BLK_FREE(sect_block, sect_buf);
-
-#ifdef QAK
-HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
-#endif /* QAK */
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_deserialize_bins() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_iterate_sect_cb
- *
- * Purpose:	Skip list iterator callback to iterate over free space sections
- *              of a particular size
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Saturday, May 13, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_iterate_sect_cb(void *_item, void UNUSED *key, void *_udata)
-{
-    H5FS_section_info_t *sect_info = (H5FS_section_info_t *)_item;   /* Free space section to work on */
-    H5FS_iter_ud3_t *udata = (H5FS_iter_ud3_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_sect_cb)
-
-    /* Check arguments. */
-    HDassert(sect_info);
-    HDassert(udata->fspace);
-    HDassert(udata->op);
-
-    /* Make callback for this section */
-    if((*udata->op)(sect_info, udata->op_data) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "iteration callback failed")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_iterate_sect_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_iterate_node_cb
- *
- * Purpose:	Skip list iterator callback to iterate over free space sections
- *              in a bin
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Saturday, May 13, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_iterate_node_cb(void *_item, void UNUSED *key, void *_udata)
-{
-    H5FS_node_t *fspace_node = (H5FS_node_t *)_item;   /* Free space size node to work on */
-    H5FS_iter_ud3_t *udata = (H5FS_iter_ud3_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_node_cb)
-
-    /* Check arguments. */
-    HDassert(fspace_node);
-    HDassert(udata->fspace);
-    HDassert(udata->op);
-
-    /* Iterate through all the sections of this size */
-    HDassert(fspace_node->sect_list);
-    if(H5SL_iterate(fspace_node->sect_list, H5FS_iterate_sect_cb, udata) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section nodes")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_iterate_node_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_iterate
- *
- * Purpose:	Iterate over all the sections managed
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Saturday, May 13, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FS_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, void *op_data)
-{
-    H5FS_iter_ud3_t udata;              /* User data for callbacks */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(op);
-
-    /* Check if we need to go deserialize the sections */
-    if(fspace->must_deserialize) {
-        fspace->must_deserialize = FALSE;
-        if(H5FS_deserialize_bins(f, dxpl_id, fspace) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't deserialize sections")
-    } /* end if */
-
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->sect_count = %Hu\n", FUNC, fspace->hdr->sect_count);
-#endif /* QAK */
-
-    /* Set up user data for iterator */
-    udata.fspace = fspace;
-    udata.op = op;
-    udata.op_data = op_data;
-
-    /* Iterate over sections, if there are any */
-    if(fspace->hdr->tot_sect_count) {
-        /* Check for whether to iterate over a single section */
-        if(fspace->single) {
-#ifdef QAK
-HDfprintf(stderr, "%s: 'Iterating' over a single section\n", FUNC);
-#endif /* QAK */
-            /* "Iterate" over the single node */
-            if(H5FS_iterate_sect_cb(fspace->single, NULL, &udata) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't 'iterate' over single section")
-        } /* end if */
-        else {
-            unsigned bin;           /* Current bin we are on */
-
-            /* Iterate over all the bins */
-#ifdef QAK
-HDfprintf(stderr, "%s: Iterate over section bins\n", FUNC);
-#endif /* QAK */
-            for(bin = 0; bin < fspace->nbins; bin++) {
-                /* Check if there are any sections in this bin */
-                if(fspace->bins[bin].bin_list) {
-                    /* Iterate over list of section size nodes for bin */
-                    if(H5SL_iterate(fspace->bins[bin].bin_list, H5FS_iterate_node_cb, &udata) < 0)
-                        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section size nodes")
-                } /* end if */
-            } /* end for */
-        } /* end else */
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_iterate() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_get_sect_count
- *
- * Purpose:	Retrieve the number of sections managed
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, May 30, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FS_get_sect_count(const H5FS_t *fspace, hsize_t *nsects)
-{
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FS_get_sect_count, FAIL)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(nsects);
-
-    /* Get the section count */
-    *nsects = fspace->hdr->tot_sect_count;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_get_sect_count() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_sect_change_class
- *
- * Purpose:	Make appropriate adjustments to internal data structures when
- *              a section changes class
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, July 10, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FS_sect_change_class(H5FS_t *fspace, H5FS_section_info_t *sect, unsigned new_class)
-{
-    const H5FS_section_class_t *old_cls;        /* Old class of section */
-    const H5FS_section_class_t *new_cls;        /* New class of section */
-    unsigned old_class;                         /* Old class ID of section */
-    herr_t ret_value = SUCCEED;                 /* Return value */
-
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_change_class)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(fspace->must_deserialize == FALSE);
-    HDassert(sect);
-    HDassert(sect->type < fspace->hdr->nclasses);
-    HDassert(new_class < fspace->hdr->nclasses);
-
-    /* Get class info */
-    old_class = sect->type;
-    old_cls = &fspace->sect_cls[sect->type];
-    new_cls = &fspace->sect_cls[new_class];
-#ifdef QAK
-HDfprintf(stderr, "%s: old_cls->flags = %x\n", FUNC, old_cls->flags);
-HDfprintf(stderr, "%s: new_cls->flags = %x\n", FUNC, new_cls->flags);
-#endif /* QAK */
-
-    /* Check if the section's class change will affect the # of serializable or ghost sections */
-    if((old_cls->flags & H5FS_CLS_GHOST_OBJ) != (new_cls->flags & H5FS_CLS_GHOST_OBJ)) {
-        hbool_t to_ghost;       /* Flag if the section is changing to a ghost section */
-
-        /* Determine if this section is becoming a ghost or is becoming serializable */
-        if(old_cls->flags & H5FS_CLS_GHOST_OBJ)
-            to_ghost = FALSE;
-        else
-            to_ghost = TRUE;
-#ifdef QAK
-HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
-#endif /* QAK */
-
-        /* Check for single vs. multiple sections managed */
-        if(fspace->single) {
-            /* Adjust serializable/ghost counts */
-            if(to_ghost) {
-                fspace->serial_size_count = 0;
-                fspace->ghost_size_count = 1;
-                fspace->hdr->serial_sect_count = 0;
-                fspace->hdr->ghost_sect_count = 1;
-            } /* end if */
-            else {
-                fspace->serial_size_count = 1;
-                fspace->ghost_size_count = 0;
-                fspace->hdr->serial_sect_count = 1;
-                fspace->hdr->ghost_sect_count = 0;
-            } /* end else */
-        } /* end if */
-        else {
-            H5FS_node_t *fspace_node;       /* Free list size node */
-            unsigned bin;                   /* Bin to put the free space section in */
-
-            /* Sanity check */
-            HDassert(fspace->bins);
-
-            /* Determine correct bin which holds items of at least the section's size */
-            bin = H5V_log2_gen(sect->size);
-            HDassert(bin < fspace->nbins);
-            HDassert(fspace->bins[bin].bin_list);
-
-            /* Get space node for section's size */
-            fspace_node = H5SL_search(fspace->bins[bin].bin_list, &sect->size);
-            HDassert(fspace_node);
-
-            /* Adjust serializable/ghost counts */
-            if(to_ghost) {
-                /* Adjust global section count totals */
-                fspace->hdr->serial_sect_count--;
-                fspace->hdr->ghost_sect_count++;
-
-                /* Adjust bin's section count totals */
-                fspace->bins[bin].serial_sect_count--;
-                fspace->bins[bin].ghost_sect_count++;
-
-                /* Adjust section size node's section count totals */
-                fspace_node->serial_count--;
-                fspace_node->ghost_count++;
-
-                /* Check if we switched a section size node's status */
-                if(fspace_node->serial_count == 0)
-                    fspace->serial_size_count--;
-                if(fspace_node->ghost_count == 1)
-                    fspace->ghost_size_count++;
-            } /* end if */
-            else {
-                /* Adjust global section count totals */
-                fspace->hdr->serial_sect_count++;
-                fspace->hdr->ghost_sect_count--;
-
-                /* Adjust bin's section count totals */
-                fspace->bins[bin].serial_sect_count++;
-                fspace->bins[bin].ghost_sect_count--;
-
-                /* Adjust section size node's section count totals */
-                fspace_node->serial_count++;
-                fspace_node->ghost_count--;
-
-                /* Check if we switched a section size node's status */
-                if(fspace_node->serial_count == 1)
-                    fspace->serial_size_count++;
-                if(fspace_node->ghost_count == 0)
-                    fspace->ghost_size_count--;
-            } /* end else */
-        } /* end else */
-    } /* end if */
-
-    /* Check if the section's class change will affect the mergable list */
-    if((old_cls->flags & H5FS_CLS_SEPAR_OBJ) != (new_cls->flags & H5FS_CLS_SEPAR_OBJ)) {
-        hbool_t to_mergable;       /* Flag if the section is changing to a mergable section */
-
-        /* Determine if this section is becoming mergable or is becoming separate */
-        if(old_cls->flags & H5FS_CLS_SEPAR_OBJ)
-            to_mergable = TRUE;
-        else
-            to_mergable = FALSE;
-#ifdef QAK
-HDfprintf(stderr, "%s: to_mergable = %u\n", FUNC, to_mergable);
-#endif /* QAK */
-
-        /* Add or remove section from merge list, as appropriate */
-        if(to_mergable) {
-#ifdef QAK
-HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
-#endif /* QAK */
-            if(fspace->merge_list == NULL)
-                if(NULL == (fspace->merge_list = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
-                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for merging free space sections")
-            if(H5SL_insert(fspace->merge_list, sect, &sect->addr) < 0)
-                HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into merging skip list")
-        } /* end if */
-        else {
-            H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
-
-#ifdef QAK
-HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
-#endif /* QAK */
-            tmp_sect_node = H5SL_remove(fspace->merge_list, &sect->addr);
-            if(tmp_sect_node == NULL || tmp_sect_node != sect)
-                HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
-        } /* end else */
-    } /* end if */
-
-    /* Change the section's class */
-    sect->type = new_class;
-
-    /* Change the serialized size of sections */
-    fspace->serial_size -= fspace->sect_cls[old_class].serial_size;
-    fspace->serial_size += fspace->sect_cls[new_class].serial_size;
-
-    /* Update current space used for free space sections */
-    fspace->hdr->sect_size = H5FS_serialize_size(fspace);
-    
-    /* Mark free space as dirty also */
-    fspace->dirty = TRUE;
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_sect_change_class() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_flush_cb
- *
- * Purpose:	Skip list iterator callback to syncronize free space sections
- *              in a free space manager with their serialized form for the
- *              metadata cache
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-static herr_t
-H5FS_flush_cb(void *_item, void UNUSED *key, void *_udata)
-{
-    H5FS_t *fspace = (H5FS_t *)_item;   /* Free space manager to syncronize */
-    H5FS_iter_ud1_t *udata = (H5FS_iter_ud1_t *)_udata; /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FS_flush_cb, FAIL)
-
-    /* Check arguments. */
-    HDassert(fspace);
-    HDassert(udata->f);
-
-    /* Serialize the bins for this free space manager, if they are dirty */
-    if(fspace->dirty) {
-        HDassert(fspace->must_deserialize == FALSE);
-        if(H5FS_serialize_bins(udata->f, udata->dxpl_id, fspace) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTSERIALIZE, FAIL, "can't syncronize bins")
-    } /* end if */
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_flush_cb() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5FS_flush
- *
- * Purpose:	Syncronize free space sections in all the free space
- *              managers with their serialized form for the metadata cache
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Monday, May  8, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5FS_flush(H5F_t *f, hid_t dxpl_id, unsigned UNUSED flags)
-{
-    H5FS_iter_ud1_t udata;              /* Callback info */
-    herr_t ret_value = SUCCEED;         /* Return value */
-
-    FUNC_ENTER_NOAPI(H5FS_flush, FAIL)
-
-    /* Check arguments. */
-    HDassert(f);
-
-    /* Set up callback information */
-    udata.f = f;
-    udata.dxpl_id = dxpl_id;
-
-    /* Iterate over open free space managers, to syncronize their section information */
-    HDassert(H5FS_open_g);
-    if(H5SL_iterate(H5FS_open_g, H5FS_flush_cb, &udata) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't syncronize section info")
-
-done:
-    FUNC_LEAVE_NOAPI(ret_value)
-} /* H5FS_flush() */
-
-
-/*-------------------------------------------------------------------------
  * Function:	H5FS_delete
  *
  * Purpose:	Delete a free space manager on disk
@@ -2896,7 +265,7 @@ done:
 herr_t
 H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr)
 {
-    H5FS_hdr_t *fs_hdr = NULL;  /* Free space header loaded from file */
+    H5FS_t *fspace = NULL;              /* Free space header loaded from file */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(H5FS_delete, FAIL)
@@ -2909,17 +278,17 @@ HDfprintf(stderr, "%s: Deleting free space manager\n", FUNC);
     HDassert(H5F_addr_defined(fs_addr));
 
     /* Protect the free space header */
-    if(NULL == (fs_hdr = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, NULL, NULL, H5AC_WRITE)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, NULL, NULL, H5AC_WRITE)))
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, FAIL, "unable to protect free space header")
 
     /* Delete serialized section storage, if there are any */
 #ifdef QAK
 HDfprintf(stderr, "%s: fs_hdr->sect_addr = %a\n", FUNC, fs_hdr->sect_addr);
 #endif /* QAK */
-    if(fs_hdr->serial_sect_count > 0) {
-        HDassert(H5F_addr_defined(fs_hdr->sect_addr));
-        HDassert(fs_hdr->sect_size > 0);
-        if(H5MF_xfree(f, H5FD_MEM_FSPACE_SECTS, dxpl_id, fs_hdr->sect_addr, fs_hdr->alloc_sect_size)<0)
+    if(fspace->serial_sect_count > 0) {
+        HDassert(H5F_addr_defined(fspace->sect_addr));
+        HDassert(fspace->sect_size > 0);
+        if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->sect_addr, fspace->alloc_sect_size)<0)
             HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to release free space sections")
     } /* end if */
 
@@ -2928,9 +297,9 @@ HDfprintf(stderr, "%s: fs_hdr->sect_addr = %a\n", FUNC, fs_hdr->sect_addr);
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to release free space header")
 
     /* Release the free space header */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fs_hdr, H5AC__DELETED_FLAG) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__DELETED_FLAG) < 0)
         HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, FAIL, "unable to release free space header")
-    fs_hdr = NULL;
+    fspace = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
@@ -2955,7 +324,6 @@ done:
 herr_t
 H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
 {
-    unsigned u;                 /* Local index variable */
     herr_t ret_value = SUCCEED;         /* Return value */
 
     FUNC_ENTER_NOAPI(H5FS_close, FAIL)
@@ -2967,94 +335,130 @@ H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
 HDfprintf(stderr, "%s: Entering\n", FUNC);
 #endif /* QAK */
 
-    /* Remove the free space manager from the list of open free space managers */
-    if(H5FS_open_remove(fspace) < 0)
-	HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove free space header from open list")
+    /* Check if section info is valid */
+    if(fspace->sinfo) {
+        HDassert(H5F_addr_defined(fspace->sect_addr));
 
-    /* Serialize the sections in the bins, if necessary */
-    if(fspace->dirty) {
-        HDassert(fspace->must_deserialize == FALSE);
-        if(H5FS_serialize_bins(f, dxpl_id, fspace) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTSERIALIZE, FAIL, "can't syncronize bins")
-    } /* end if */
+        /* Unpin the free space section info in the cache */
+        if(H5AC_unpin_entry(f, fspace->sinfo) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space section info")
 
+        /* If there aren't any sections being managed, free the space for the sections */
 #ifdef QAK
-HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", FUNC, fspace->hdr->tot_sect_count);
+HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
 #endif /* QAK */
-    /* Check for single section to free */
-    if(fspace->single) {
-        /* Call the 'free' callback for the section */
-        (*fspace->sect_cls[fspace->single->type].free)(fspace->single);
-        fspace->single = NULL;
-    } /* end if */
-    HDassert(fspace->single == NULL);
-
-    /* Release bins for skip lists */
-    if(fspace->bins) {
-        /* Clear out lists of nodes */
-        for(u = 0; u < fspace->nbins; u++)
-            if(fspace->bins[u].bin_list) {
-                H5SL_destroy(fspace->bins[u].bin_list, H5FS_node_free_cb, fspace);
-                fspace->bins[u].bin_list = NULL;
-            } /* end if */
-
-        H5FL_SEQ_FREE(H5FS_bin_t, fspace->bins);
-    } /* end if */
+        if(fspace->tot_sect_count == 0) {
+            haddr_t old_addr;           /* Old section info address */
 
-    /* Release skip list for merging sections */
-    if(fspace->merge_list)
-        if(H5SL_close(fspace->merge_list) < 0)
-            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy section merging skip list")
+            HDassert(fspace->serial_sect_count == 0);
+            HDassert(fspace->ghost_sect_count == 0);
 
-    /* Unpin the free space header in the cache */
-    if(H5AC_unpin_entry(f, fspace->hdr) < 0)
-        HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space header")
+            /* Free previous serialized sections disk space */
+            old_addr = fspace->sect_addr;
+            if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_addr, fspace->alloc_sect_size) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to release free space sections")
 
-    /* Terminate the section classes for this free space list */
-    for(u = 0; u < fspace->hdr->nclasses ; u++) {
-        /* Call the class termination routine, if there is one */
-        if(fspace->sect_cls[u].term_cls)
-            if((fspace->sect_cls[u].term_cls)(&fspace->sect_cls[u]) < 0)
-                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "unable to finalize section class")
-    } /* end for */
+            /* Reset section info */
+            fspace->sect_addr = HADDR_UNDEF;
+            fspace->alloc_sect_size = fspace->sect_size = 0;
 
-    /* Release the memory for the free space section classes */
-    fspace->sect_cls = H5FL_SEQ_FREE(H5FS_section_class_t, fspace->sect_cls);
+            /* Mark free space header as dirty */
+            if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
 
-    /* Free free space info */
-    H5FL_FREE(H5FS_t, fspace);
+            /* Evict the section info from the metadata cache */
+            if(H5AC_expunge_entry(f, dxpl_id, H5AC_FSPACE_SINFO, old_addr) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "unable to remove free space section info from cache")
+        } /* end if */
+    } /* end if */
+    else {
+        /* Unpin the free space header in the cache */
+        /* (the section info destructor would unpin it if the section info existed) */
+        if(H5AC_unpin_entry(f, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space header")
+    } /* end else */
+
+    /* Reset the header's pointer to the section info, so it will get pinned again
+     *  if the free space header is still in the metadata cache when the free
+     *  space manager is re-opened.
+     */
+    fspace->sinfo = NULL;
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5FS_close() */
 
-herr_t
-H5FS_debug_test(const H5FS_t *fspace)
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_new
+ *
+ * Purpose:	Create new free space manager structure
+ *
+ * Return:	Success:	non-NULL, pointer to new free space manager struct
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, July 31, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+H5FS_t *
+H5FS_new(size_t nclasses, const H5FS_section_class_t *classes[],
+    void *cls_init_udata)
 {
-    FUNC_ENTER_NOAPI_NOINIT(H5FS_debug_test)
-
-    HDfprintf(stderr, "%s: fspace->merge_list = %p\n", FUNC, fspace->merge_list);
-    if(fspace->merge_list) {
-        H5SL_node_t *merge_node;
-        H5FS_section_info_t *sect;
-
-        merge_node = H5SL_last(fspace->merge_list);
-        HDfprintf(stderr, "%s: last merge node = %p\n", FUNC, merge_node);
-        if(merge_node) {
-            sect = H5SL_item(merge_node);
-            HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", FUNC, sect->size, sect->addr, sect->type);
-        } /* end if */
+    H5FS_t *fspace;             /* Free space manager */
+    size_t u;                   /* Local index variable */
+    H5FS_t *ret_value;          /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_new)
+
+    /* Check arguments. */
+    HDassert(nclasses || classes);
+
+    /*
+     * Allocate free space structure
+     */
+    if(NULL == (fspace = H5FL_CALLOC(H5FS_t)))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space free list")
+
+    /* Set immutable free list parameters */
+    fspace->nclasses = nclasses;
+    if(nclasses > 0) {
+        if(NULL == (fspace->sect_cls = H5FL_SEQ_MALLOC(H5FS_section_class_t, nclasses)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section class array")
+
+        /* Initialize the section classes for this free space list */
+        for(u = 0; u < nclasses; u++) {
+            /* Make certain that section class type can be used as an array index into this array */
+            HDassert(u == classes[u]->type);
+
+            /* Copy the class information into the free space manager */
+            HDmemcpy(&fspace->sect_cls[u], classes[u], sizeof(H5FS_section_class_t));
+
+            /* Call the class initialization routine, if there is one */
+            if(fspace->sect_cls[u].init_cls)
+                if((fspace->sect_cls[u].init_cls)(&fspace->sect_cls[u], cls_init_udata) < 0)
+                    HGOTO_ERROR(H5E_RESOURCE, H5E_CANTINIT, NULL, "unable to initialize section class")
+        } /* end for */
     } /* end if */
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
-}
+    /* Initialize non-zero information for new free space manager */
+    fspace->addr = HADDR_UNDEF;
+    fspace->sect_addr = HADDR_UNDEF;
+
+    /* Set return value */
+    ret_value = fspace;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_new() */
 
 #ifdef H5FS_DEBUG
 
 /*-------------------------------------------------------------------------
  * Function:	H5FS_assert
  *
- * Purpose:	Verify that the sections managed are mostly sane
+ * Purpose:	Verify that the free space manager is mostly sane
  *
  * Return:	Non-negative on success, negative on failure
  *
@@ -3067,178 +471,26 @@ H5FS_debug_test(const H5FS_t *fspace)
 herr_t
 H5FS_assert(const H5FS_t *fspace)
 {
-    hsize_t separate_obj;       /* The number of separate objects managed */
-
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_assert)
 #ifdef QAK
 HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", "H5FS_assert", fspace->hdr->tot_sect_count);
 #endif /* QAK */
 
-    /* Initialize state */
-    separate_obj = 0;
-
-    /* Check for single vs. multiple sections managed */
-    if(fspace->single) {
-        const H5FS_section_class_t *cls;    /* Class of section */
-
-        HDassert(fspace->tot_size_count == 1);
-        HDassert(fspace->hdr->tot_sect_count == 1);
-
-        /* Get section's class */
-        cls = &fspace->sect_cls[fspace->single->type];
-#ifdef QAK
-HDfprintf(stderr, "%s: fspace->single->size = %Hu, fspace->single->addr = %a, fspace->single->type = %u\n", "H5FS_assert", fspace->single->size, fspace->single->addr, fspace->single->type);
-#endif /* QAK */
-
-        /* Sanity checks on counts */
-        if(cls->flags & H5FS_CLS_GHOST_OBJ) {
-            HDassert(fspace->serial_size_count == 0);
-            HDassert(fspace->ghost_size_count == 1);
-            HDassert(fspace->hdr->serial_sect_count == 0);
-            HDassert(fspace->hdr->ghost_sect_count == 1);
-        } /* end if */
-        else {
-            HDassert(fspace->serial_size_count == 1);
-            HDassert(fspace->ghost_size_count == 0);
-            HDassert(fspace->hdr->serial_sect_count == 1);
-            HDassert(fspace->hdr->ghost_sect_count == 0);
-        } /* end else */
-
-        /* Count node, if separate */
-        if(cls->flags & H5FS_CLS_SEPAR_OBJ)
-            separate_obj++;
-    } /* end if */
-    else if(fspace->bins) {
-        hsize_t acc_tot_sect_count;     /* Accumulated total section count from bins */
-        hsize_t acc_serial_sect_count;  /* Accumulated serializable section count from bins */
-        hsize_t acc_ghost_sect_count;   /* Accumulated ghost section count from bins */
-        size_t acc_tot_size_count;      /* Accumulated total section size count from bins */
-        size_t acc_serial_size_count;   /* Accumulated serializable section size count from bins */
-        size_t acc_ghost_size_count;    /* Accumulated ghost section size count from bins */
-        unsigned u;             /* Local index variable */
-
-        /* Walk through all sections in bins */
-        acc_tot_sect_count = 0;
-        acc_serial_sect_count = 0;
-        acc_ghost_sect_count = 0;
-        acc_tot_size_count = 0;
-        acc_serial_size_count = 0;
-        acc_ghost_size_count = 0;
-        for(u = 0; u < fspace->nbins; u++) {
-            acc_tot_sect_count += fspace->bins[u].tot_sect_count;
-            acc_serial_sect_count += fspace->bins[u].serial_sect_count;
-            acc_ghost_sect_count += fspace->bins[u].ghost_sect_count;
-            if(fspace->bins[u].bin_list) {
-                H5SL_node_t *curr_size_node;    /* Current section size node in skip list */
-                size_t bin_serial_count;        /* # of serializable sections in this bin */
-                size_t bin_ghost_count;         /* # of ghost sections in this bin */
-
-                acc_tot_size_count += H5SL_count(fspace->bins[u].bin_list);
-
-                /* Walk through the sections in this bin */
-                curr_size_node = H5SL_first(fspace->bins[u].bin_list);
-                bin_serial_count = 0;
-                bin_ghost_count = 0;
-                while(curr_size_node != NULL) {
-                    H5FS_node_t *fspace_node;       /* Section size node */
-                    H5SL_node_t *curr_sect_node;    /* Current section node in skip list */
-                    size_t size_serial_count;       /* # of serializable sections of this size */
-                    size_t size_ghost_count;        /* # of ghost sections of this size */
-
-                    /* Get section size node */
-                    fspace_node = H5SL_item(curr_size_node);
-
-                    /* Check sections on list */
-                    curr_sect_node = H5SL_first(fspace_node->sect_list);
-                    size_serial_count = 0;
-                    size_ghost_count = 0;
-                    while(curr_sect_node != NULL) {
-                        H5FS_section_class_t *cls;      /* Class of section */
-                        H5FS_section_info_t *sect;      /* Section */
-
-                        /* Get section node & it's class */
-                        sect = H5SL_item(curr_sect_node);
-                        cls = &fspace->sect_cls[sect->type];
-#ifdef QAK
-HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H5FS_assert", sect->size, sect->addr, sect->type);
-#endif /* QAK */
-
-                        /* Sanity check section */
-                        HDassert(H5F_addr_defined(sect->addr));
-                        HDassert(fspace_node->sect_size == sect->size);
-                        if(cls->valid)
-                            (*cls->valid)(cls, sect);
-
-                        /* Add to correct count */
-                        if(cls->flags & H5FS_CLS_GHOST_OBJ)
-                            size_ghost_count++;
-                        else
-                            size_serial_count++;
-
-                        /* Count node, if separate */
-                        if(cls->flags & H5FS_CLS_SEPAR_OBJ)
-                            separate_obj++;
-
-                        /* Get the next section node in the list */
-                        curr_sect_node = H5SL_next(curr_sect_node);
-                    } /* end while */
-
-                    /* Check the number of serializable & ghost sections of this size */
-                    HDassert(fspace_node->serial_count == size_serial_count);
-                    HDassert(fspace_node->ghost_count == size_ghost_count);
-
-                    /* Add to global count of serializable & ghost section sizes */
-                    if(fspace_node->serial_count > 0)
-                        acc_serial_size_count++;
-                    if(fspace_node->ghost_count > 0)
-                        acc_ghost_size_count++;
-
-                    /* Add to bin's serializable & ghost counts */
-                    bin_serial_count += size_serial_count;
-                    bin_ghost_count += size_ghost_count;
-
-                    /* Get the next section size node in the list */
-                    curr_size_node = H5SL_next(curr_size_node);
-                } /* end while */
-
-                /* Check the number of serializable & ghost sections in this bin */
-                HDassert(fspace->bins[u].tot_sect_count == (bin_serial_count + bin_ghost_count));
-                HDassert(fspace->bins[u].serial_sect_count == bin_serial_count);
-                HDassert(fspace->bins[u].ghost_sect_count == bin_ghost_count);
-            } /* end if */
-        } /* end for */
-
-        /* Check counts from bins vs. global counts */
-        HDassert(fspace->tot_size_count == acc_tot_size_count);
-        HDassert(fspace->serial_size_count == acc_serial_size_count);
-        HDassert(fspace->ghost_size_count == acc_ghost_size_count);
-        HDassert(fspace->hdr->tot_sect_count == acc_tot_sect_count);
-        HDassert(fspace->hdr->serial_sect_count == acc_serial_sect_count);
-        HDassert(fspace->hdr->ghost_sect_count == acc_ghost_sect_count);
-    } /* end else */
-    else {
-        /* Check counts are zero */
-        HDassert(fspace->hdr->tot_sect_count == 0);
-        HDassert(fspace->hdr->serial_sect_count == 0);
-        HDassert(fspace->hdr->ghost_sect_count == 0);
-    } /* end else */
+    /* Sanity check sections */
+    H5FS_sect_assert(fspace);
 
     /* General assumptions about the section size counts */
-    HDassert(fspace->tot_size_count >= fspace->serial_size_count);
-    HDassert(fspace->tot_size_count >= fspace->ghost_size_count);
+    HDassert(fspace->sinfo->tot_size_count >= fspace->sinfo->serial_size_count);
+    HDassert(fspace->sinfo->tot_size_count >= fspace->sinfo->ghost_size_count);
 
     /* General assumptions about the section counts */
-    HDassert(fspace->hdr->tot_sect_count >= fspace->hdr->serial_sect_count);
-    HDassert(fspace->hdr->tot_sect_count >= fspace->hdr->ghost_sect_count);
-    HDassert(fspace->hdr->tot_sect_count == (fspace->hdr->serial_sect_count + fspace->hdr->ghost_sect_count));
+    HDassert(fspace->tot_sect_count >= fspace->serial_sect_count);
+    HDassert(fspace->tot_sect_count >= fspace->ghost_sect_count);
+    HDassert(fspace->tot_sect_count == (fspace->serial_sect_count + fspace->ghost_sect_count));
 #ifdef QAK
-    HDassert(fspace->hdr->serial_sect_count > 0 || fspace->hdr->ghost_sect_count == 0);
+    HDassert(fspace->serial_sect_count > 0 || fspace->ghost_sect_count == 0);
 #endif /* QAK */
 
-    /* Make certain that the number of sections on the address list is correct */
-    if(fspace->merge_list)
-        HDassert(fspace->hdr->tot_sect_count == (separate_obj + H5SL_count(fspace->merge_list)));
-
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* end H5FS_assert() */
 #endif /* H5FS_DEBUG */
diff --git a/src/H5FScache.c b/src/H5FScache.c
index c6fd297..a2d7e67 100644
--- a/src/H5FScache.c
+++ b/src/H5FScache.c
@@ -35,6 +35,7 @@
 #include "H5private.h"		/* Generic Functions			*/
 #include "H5Eprivate.h"		/* Error handling		  	*/
 #include "H5FSpkg.h"		/* File free space			*/
+#include "H5Vprivate.h"		/* Vectors and arrays 			*/
 
 /****************/
 /* Local Macros */
@@ -42,12 +43,20 @@
 
 /* File free space format version #'s */
 #define H5FS_HDR_VERSION        0               /* Header */
+#define H5FS_SINFO_VERSION      0               /* Serialized sections */
 
 
 /******************/
 /* Local Typedefs */
 /******************/
 
+/* User data for skip list iterator callback for iterating over section size nodes when syncing */
+typedef struct {
+    H5FS_sinfo_t *sinfo;        /* Free space section info */
+    uint8_t **p;                /* Pointer to address of buffer pointer to serialize with */
+    unsigned sect_cnt_size;     /* # of bytes to encode section size counts in */
+} H5FS_iter_ud_t;
+
 
 /********************/
 /* Package Typedefs */
@@ -58,11 +67,21 @@
 /* Local Prototypes */
 /********************/
 
+/* Section info routines */
+static herr_t H5FS_sinfo_free_sect_cb(void *item, void *key, void *op_data);
+static herr_t H5FS_sinfo_free_node_cb(void *item, void *key, void *op_data);
+static herr_t H5FS_sinfo_serialize_sect_cb(void *_item, void UNUSED *key, void *_udata);
+static herr_t H5FS_sinfo_serialize_node_cb(void *_item, void UNUSED *key, void *_udata);
+
 /* Metadata cache callbacks */
-static H5FS_hdr_t *H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata, void *udata2);
-static herr_t H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_hdr_t *hdr);
-static herr_t H5FS_cache_hdr_clear(H5F_t *f, H5FS_hdr_t *hdr, hbool_t destroy);
-static herr_t H5FS_cache_hdr_size(const H5F_t *f, const H5FS_hdr_t *hdr, size_t *size_ptr);
+static H5FS_t *H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata, void *udata2);
+static herr_t H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_t *fspace);
+static herr_t H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy);
+static herr_t H5FS_cache_hdr_size(const H5F_t *f, const H5FS_t *fspace, size_t *size_ptr);
+static H5FS_sinfo_t *H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *udata, void *udata2);
+static herr_t H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_sinfo_t *sinfo);
+static herr_t H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy);
+static herr_t H5FS_cache_sinfo_size(const H5F_t *f, const H5FS_sinfo_t *sinfo, size_t *size_ptr);
 
 /*********************/
 /* Package Variables */
@@ -78,6 +97,16 @@ const H5AC_class_t H5AC_FSPACE_HDR[1] = {{
     (H5AC_size_func_t)H5FS_cache_hdr_size,
 }};
 
+/* H5FS serialized sections inherit cache-like properties from H5AC */
+const H5AC_class_t H5AC_FSPACE_SINFO[1] = {{
+    H5AC_FSPACE_SINFO_ID,
+    (H5AC_load_func_t)H5FS_cache_sinfo_load,
+    (H5AC_flush_func_t)H5FS_cache_sinfo_flush,
+    (H5AC_dest_func_t)H5FS_cache_sinfo_dest,
+    (H5AC_clear_func_t)H5FS_cache_sinfo_clear,
+    (H5AC_size_func_t)H5FS_cache_sinfo_size,
+}};
+
 
 /*****************************/
 /* Library Private Variables */
@@ -91,15 +120,17 @@ const H5AC_class_t H5AC_FSPACE_HDR[1] = {{
 /* Declare a free list to manage free space header data to/from disk */
 H5FL_BLK_DEFINE_STATIC(header_block);
 
+/* Declare a free list to manage free space section data to/from disk */
+H5FL_BLK_DEFINE_STATIC(sect_block);
+
 
 
 /*-------------------------------------------------------------------------
  * Function:	H5FS_cache_hdr_load
  *
- * Purpose:	Loads a free space header from the disk.
+ * Purpose:	Loads a free space manager header from the disk.
  *
  * Return:	Success:	Pointer to a new free space header
- *
  *		Failure:	NULL
  *
  * Programmer:	Quincey Koziol
@@ -108,15 +139,17 @@ H5FL_BLK_DEFINE_STATIC(header_block);
  *
  *-------------------------------------------------------------------------
  */
-static H5FS_hdr_t *
-H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1, void UNUSED *udata2)
+static H5FS_t *
+H5FS_cache_hdr_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void *_fs_prot, void UNUSED *udata2)
 {
-    H5FS_hdr_t		*hdr = NULL;    /* Free space header info */
+    H5FS_t		*fspace = NULL; /* Free space header info */
+    const H5FS_prot_t   *fs_prot = (const H5FS_prot_t *)_fs_prot;       /* User data for protecting */
     size_t		size;           /* Header size */
     uint8_t		*buf = NULL;    /* Temporary buffer */
     const uint8_t	*p;             /* Pointer into raw data buffer */
     uint32_t            metadata_chksum;        /* Metadata checksum value */
-    H5FS_hdr_t		*ret_value;     /* Return value */
+    unsigned            nclasses;       /* Number of section classes */
+    H5FS_t		*ret_value;     /* Return value */
 
     FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_load)
 #ifdef QAK
@@ -126,11 +159,11 @@ HDfprintf(stderr, "%s: Load free space header, addr = %a\n", FUNC, addr);
     /* Check arguments */
     HDassert(f);
     HDassert(H5F_addr_defined(addr));
+    HDassert(fs_prot);
 
-    /* Allocate space for the free space header */
-    if(NULL == (hdr = H5FL_MALLOC(H5FS_hdr_t)))
+    /* Allocate a new free space manager */
+    if(NULL == (fspace = H5FS_new(fs_prot->nclasses, fs_prot->classes, fs_prot->cls_init_udata)))
 	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
-    HDmemset(&hdr->cache_info, 0, sizeof(H5AC_info_t));
 
     /* Compute the size of the free space header on disk */
     size = H5FS_HEADER_SIZE(f);
@@ -166,56 +199,58 @@ HDfprintf(stderr, "%s: Load free space header, addr = %a\n", FUNC, addr);
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "incorrect metadata checksum for free space header")
 
     /* Client ID */
-    hdr->client = *p++;
-    if(hdr->client >= H5FS_NUM_CLIENT_ID)
+    fspace->client = *p++;
+    if(fspace->client >= H5FS_NUM_CLIENT_ID)
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "unknown client ID in free space header")
 
     /* Total space tracked */
-    H5F_DECODE_LENGTH(f, p, hdr->tot_space);
+    H5F_DECODE_LENGTH(f, p, fspace->tot_space);
 
     /* Total # of free space sections tracked */
-    H5F_DECODE_LENGTH(f, p, hdr->tot_sect_count);
+    H5F_DECODE_LENGTH(f, p, fspace->tot_sect_count);
 
     /* # of serializable free space sections tracked */
-    H5F_DECODE_LENGTH(f, p, hdr->serial_sect_count);
+    H5F_DECODE_LENGTH(f, p, fspace->serial_sect_count);
 
     /* # of ghost free space sections tracked */
-    H5F_DECODE_LENGTH(f, p, hdr->ghost_sect_count);
+    H5F_DECODE_LENGTH(f, p, fspace->ghost_sect_count);
 
     /* # of section classes */
-    UINT16DECODE(p, hdr->nclasses);
+    UINT16DECODE(p, nclasses);
+    if(fspace->nclasses != nclasses)
+	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "unknown section class count mismatch")
 
     /* Shrink percent */
-    UINT16DECODE(p, hdr->shrink_percent);
+    UINT16DECODE(p, fspace->shrink_percent);
 
     /* Expand percent */
-    UINT16DECODE(p, hdr->expand_percent);
+    UINT16DECODE(p, fspace->expand_percent);
 
     /* Size of address space free space sections are within (log2 of actual value) */
-    UINT16DECODE(p, hdr->max_sect_addr);
+    UINT16DECODE(p, fspace->max_sect_addr);
 
     /* Max. size of section to track */
-    H5F_DECODE_LENGTH(f, p, hdr->max_sect_size);
+    H5F_DECODE_LENGTH(f, p, fspace->max_sect_size);
 
     /* Address of serialized free space sections */
-    H5F_addr_decode(f, &p, &hdr->sect_addr);
+    H5F_addr_decode(f, &p, &fspace->sect_addr);
 
     /* Size of serialized free space sections */
-    H5F_DECODE_LENGTH(f, p, hdr->sect_size);
+    H5F_DECODE_LENGTH(f, p, fspace->sect_size);
 
     /* Allocated size of serialized free space sections */
-    H5F_DECODE_LENGTH(f, p, hdr->alloc_sect_size);
+    H5F_DECODE_LENGTH(f, p, fspace->alloc_sect_size);
 
     HDassert((size_t)(p - buf) == size);
 
     /* Set return value */
-    ret_value = hdr;
+    ret_value = fspace;
 
 done:
     if(buf)
         H5FL_BLK_FREE(header_block, buf);
-    if(!ret_value && hdr)
-        (void)H5FS_cache_hdr_dest(f, hdr);
+    if(!ret_value && fspace)
+        (void)H5FS_cache_hdr_dest(f, fspace);
 
     FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_hdr_load() */ /*lint !e818 Can't make udata a pointer to const */
@@ -235,7 +270,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_hdr_t *hdr)
+H5FS_cache_hdr_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_t *fspace)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -247,9 +282,9 @@ HDfprintf(stderr, "%s: Flushing free space header, addr = %a, destroy = %u\n", F
     /* check arguments */
     HDassert(f);
     HDassert(H5F_addr_defined(addr));
-    HDassert(hdr);
+    HDassert(fspace);
 
-    if(hdr->cache_info.is_dirty) {
+    if(fspace->cache_info.is_dirty) {
         uint8_t	*buf = NULL;        /* Temporary raw data buffer */
         uint8_t *p;                 /* Pointer into raw data buffer */
         size_t	size;               /* Header size on disk */
@@ -280,43 +315,43 @@ HDfprintf(stderr, "%s: Flushing free space header, addr = %a, destroy = %u\n", F
         p += 4;
 
         /* Client ID */
-        *p++ = hdr->client;
+        *p++ = fspace->client;
 
         /* Total space tracked */
-        H5F_ENCODE_LENGTH(f, p, hdr->tot_space);
+        H5F_ENCODE_LENGTH(f, p, fspace->tot_space);
 
         /* Total # of free space sections tracked */
-        H5F_ENCODE_LENGTH(f, p, hdr->tot_sect_count);
+        H5F_ENCODE_LENGTH(f, p, fspace->tot_sect_count);
 
         /* # of serializable free space sections tracked */
-        H5F_ENCODE_LENGTH(f, p, hdr->serial_sect_count);
+        H5F_ENCODE_LENGTH(f, p, fspace->serial_sect_count);
 
         /* # of ghost free space sections tracked */
-        H5F_ENCODE_LENGTH(f, p, hdr->ghost_sect_count);
+        H5F_ENCODE_LENGTH(f, p, fspace->ghost_sect_count);
 
         /* # of section classes */
-        UINT16ENCODE(p, hdr->nclasses);
+        UINT16ENCODE(p, fspace->nclasses);
 
         /* Shrink percent */
-        UINT16ENCODE(p, hdr->shrink_percent);
+        UINT16ENCODE(p, fspace->shrink_percent);
 
         /* Expand percent */
-        UINT16ENCODE(p, hdr->expand_percent);
+        UINT16ENCODE(p, fspace->expand_percent);
 
         /* Size of address space free space sections are within (log2 of actual value) */
-        UINT16ENCODE(p, hdr->max_sect_addr);
+        UINT16ENCODE(p, fspace->max_sect_addr);
 
         /* Max. size of section to track */
-        H5F_ENCODE_LENGTH(f, p, hdr->max_sect_size);
+        H5F_ENCODE_LENGTH(f, p, fspace->max_sect_size);
 
         /* Address of serialized free space sections */
-        H5F_addr_encode(f, &p, hdr->sect_addr);
+        H5F_addr_encode(f, &p, fspace->sect_addr);
 
         /* Size of serialized free space sections */
-        H5F_ENCODE_LENGTH(f, p, hdr->sect_size);
+        H5F_ENCODE_LENGTH(f, p, fspace->sect_size);
 
         /* Allocated size of serialized free space sections */
-        H5F_ENCODE_LENGTH(f, p, hdr->alloc_sect_size);
+        H5F_ENCODE_LENGTH(f, p, fspace->alloc_sect_size);
 
 	/* Write the free space header. */
         HDassert((size_t)(p - buf) == size);
@@ -325,11 +360,11 @@ HDfprintf(stderr, "%s: Flushing free space header, addr = %a, destroy = %u\n", F
 
         H5FL_BLK_FREE(header_block, buf);
 
-	hdr->cache_info.is_dirty = FALSE;
+	fspace->cache_info.is_dirty = FALSE;
     } /* end if */
 
     if(destroy)
-        if(H5FS_cache_hdr_dest(f, hdr) < 0)
+        if(H5FS_cache_hdr_dest(f, fspace) < 0)
 	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
 
 done:
@@ -352,19 +387,34 @@ done:
  */
 /* ARGSUSED */
 herr_t
-H5FS_cache_hdr_dest(H5F_t UNUSED *f, H5FS_hdr_t *hdr)
+H5FS_cache_hdr_dest(H5F_t UNUSED *f, H5FS_t *fspace)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_hdr_dest)
+    unsigned u;                 /* Local index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_hdr_dest)
 
     /*
      * Check arguments.
      */
-    HDassert(hdr);
+    HDassert(fspace);
 
-    /* Free the shared info itself */
-    H5FL_FREE(H5FS_hdr_t, hdr);
+    /* Terminate the section classes for this free space list */
+    for(u = 0; u < fspace->nclasses ; u++) {
+        /* Call the class termination routine, if there is one */
+        if(fspace->sect_cls[u].term_cls)
+            if((fspace->sect_cls[u].term_cls)(&fspace->sect_cls[u]) < 0)
+                HGOTO_ERROR(H5E_RESOURCE, H5E_CANTRELEASE, FAIL, "unable to finalize section class")
+    } /* end for */
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
+    /* Release the memory for the free space section classes */
+    fspace->sect_cls = H5FL_SEQ_FREE(H5FS_section_class_t, fspace->sect_cls);
+
+    /* Free free space info */
+    H5FL_FREE(H5FS_t, fspace);
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* end H5FS_cache_hdr_dest() */
 
 
@@ -382,7 +432,7 @@ H5FS_cache_hdr_dest(H5F_t UNUSED *f, H5FS_hdr_t *hdr)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_hdr_clear(H5F_t *f, H5FS_hdr_t *hdr, hbool_t destroy)
+H5FS_cache_hdr_clear(H5F_t *f, H5FS_t *fspace, hbool_t destroy)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -391,13 +441,13 @@ H5FS_cache_hdr_clear(H5F_t *f, H5FS_hdr_t *hdr, hbool_t destroy)
     /*
      * Check arguments.
      */
-    HDassert(hdr);
+    HDassert(fspace);
 
     /* Reset the dirty flag.  */
-    hdr->cache_info.is_dirty = FALSE;
+    fspace->cache_info.is_dirty = FALSE;
 
     if(destroy)
-        if(H5FS_cache_hdr_dest(f, hdr) < 0)
+        if(H5FS_cache_hdr_dest(f, fspace) < 0)
 	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space header")
 
 done:
@@ -421,13 +471,13 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5FS_cache_hdr_size(const H5F_t *f, const H5FS_hdr_t *hdr, size_t *size_ptr)
+H5FS_cache_hdr_size(const H5F_t *f, const H5FS_t *fspace, size_t *size_ptr)
 {
     FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_hdr_size)
 
     /* check arguments */
     HDassert(f);
-    HDassert(hdr);
+    HDassert(fspace);
     HDassert(size_ptr);
 
     /* Set size value */
@@ -436,3 +486,613 @@ H5FS_cache_hdr_size(const H5F_t *f, const H5FS_hdr_t *hdr, size_t *size_ptr)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5FS_cache_hdr_size() */
 
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_cache_sinfo_load
+ *
+ * Purpose:	Loads free space sections from the disk.
+ *
+ * Return:	Success:	Pointer to a new free space section info
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		July 31 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static H5FS_sinfo_t *
+H5FS_cache_sinfo_load(H5F_t *f, hid_t dxpl_id, haddr_t addr, const void UNUSED *udata1, void *_fspace)
+{
+    H5FS_sinfo_t	*sinfo = NULL;  /* Free space section info */
+    H5FS_t              *fspace = (H5FS_t *)_fspace;       /* User data for protecting */
+    haddr_t             fs_addr;        /* Free space header address */
+    size_t              old_sect_size;  /* Old section size */
+    uint8_t		*buf = NULL;    /* Temporary buffer */
+    const uint8_t	*p;             /* Pointer into raw data buffer */
+    uint32_t            metadata_chksum;        /* Metadata checksum value */
+    H5FS_sinfo_t	*ret_value;     /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_load)
+#ifdef QAK
+HDfprintf(stderr, "%s: Load free space sections, addr = %a\n", FUNC, addr);
+#endif /* QAK */
+
+    /* Check arguments */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(fspace);
+
+    /* Allocate a new free space section info */
+    if(NULL == (sinfo = H5FS_sinfo_new(f, fspace)))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+    
+    /* Link free space manager to section info */
+    /* (for deserializing sections) */
+    HDassert(fspace->sinfo == NULL);
+    fspace->sinfo = sinfo;
+
+    /* Allocate space for the buffer to serialize the sections into */
+    old_sect_size = fspace->sect_size;
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->sect_size = %Hu\n", FUNC, fspace->sect_size);
+#endif /* QAK */
+    if(NULL == (buf = H5FL_BLK_MALLOC(sect_block, (size_t)fspace->sect_size)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+
+    /* Read buffer from disk */
+    if(H5F_block_read(f, H5FD_MEM_FSPACE_SINFO, fspace->sect_addr, (size_t)fspace->sect_size, dxpl_id, buf) < 0)
+	HGOTO_ERROR(H5E_FSPACE, H5E_READERROR, NULL, "can't read free space sections")
+
+    /* Deserialize free sections from buffer available */
+    p = buf;
+
+    /* Magic number */
+    if(HDmemcmp(p, H5FS_SINFO_MAGIC, H5FS_SIZEOF_MAGIC))
+	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections signature")
+    p += H5FS_SIZEOF_MAGIC;
+
+    /* Version */
+    if(*p++ != H5FS_SINFO_VERSION)
+	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "wrong free space sections version")
+
+    /* Metadata flags (unused, currently) */
+/* XXX: Plan out metadata flags (including "read-only duplicate" feature) */
+    if(*p++ != 0)
+	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "unknown metadata flag in free space sections")
+
+    /* Metadata checksum (unused, currently) */
+    UINT32DECODE(p, metadata_chksum);
+/* XXX: Verify checksum */
+    if(metadata_chksum != 0)
+	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "incorrect metadata checksum for free space sections")
+
+    /* Address of free space header for these sections */
+    H5F_addr_decode(f, &p, &fs_addr);
+    if(H5F_addr_ne(fs_addr, fspace->addr))
+	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, NULL, "incorrect header address for free space sections")
+
+    /* Check for any serialized sections */
+    if(fspace->serial_sect_count > 0) {
+        hsize_t old_tot_sect_count;     /* Total section count from header */
+        hsize_t old_serial_sect_count;  /* Total serializable section count from header */
+        hsize_t old_ghost_sect_count;   /* Total ghost section count from header */
+        hsize_t old_tot_space;          /* Total space managed from header */
+        unsigned sect_cnt_size;         /* The size of the section size counts */
+
+        /* Compute the size of the section counts */
+        sect_cnt_size = MAX(1, (H5V_log2_gen(fspace->serial_sect_count) + 7) / 8);
+#ifdef QAK
+HDfprintf(stderr, "%s: sect_cnt_size = %u\n", FUNC, sect_cnt_size);
+HDfprintf(stderr, "%s: fspace->sect_len_size = %u\n", FUNC, fspace->sect_len_size);
+#endif /* QAK */
+
+        /* Reset the section count, the "add" routine will update it */
+        old_tot_sect_count = fspace->tot_sect_count;
+        old_serial_sect_count = fspace->serial_sect_count;
+        old_ghost_sect_count = fspace->ghost_sect_count;
+        old_tot_space = fspace->tot_space;
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
+HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
+HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
+HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+#endif /* QAK */
+        fspace->tot_sect_count = 0;
+        fspace->serial_sect_count = 0;
+        fspace->ghost_sect_count = 0;
+        fspace->tot_space = 0;
+
+        /* Walk through the buffer, deserializing sections */
+        do {
+            hsize_t sect_size;      /* Current section size */
+            size_t node_count;      /* # of sections of this size */
+            size_t u;               /* Local index variable */
+
+            /* The number of sections of this node's size */
+            UINT64DECODE_VAR(p, node_count, sect_cnt_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: node_count = %Zu\n", FUNC, node_count);
+#endif /* QAK */
+            HDassert(node_count);
+
+            /* The size of the sections for this node */
+            UINT64DECODE_VAR(p, sect_size, sinfo->sect_len_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: sect_size = %Hu\n", FUNC, sect_size);
+#endif /* QAK */
+            HDassert(sect_size);
+
+            /* Loop over nodes of this size */
+            for(u = 0; u < node_count; u++) {
+                H5FS_section_info_t *new_sect;  /* Section that was deserialized */
+                haddr_t sect_addr;      /* Address of free space section in the address space */
+                unsigned sect_type;     /* Type of free space section */
+                unsigned des_flags;     /* Flags from deserialize callback */
+
+                /* The address of the section */
+                UINT64DECODE_VAR(p, sect_addr, sinfo->sect_off_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: sect_addr = %a\n", FUNC, sect_addr);
+#endif /* QAK */
+
+                /* The type of this section */
+                sect_type = *p++;
+#ifdef QAK
+HDfprintf(stderr, "%s: sect_type = %u\n", FUNC, sect_type);
+#endif /* QAK */
+
+                /* Call 'deserialize' callback for this section */
+                des_flags = 0;
+                HDassert(fspace->sect_cls[sect_type].deserialize);
+                if(NULL == (new_sect = (*fspace->sect_cls[sect_type].deserialize)(&fspace->sect_cls[sect_type], dxpl_id, p, sect_addr, sect_size, &des_flags)))
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, NULL, "can't deserialize section")
+
+                /* Update offset in serialization buffer */
+                p += fspace->sect_cls[sect_type].serial_size;
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->sect_cls[%u].serial_size = %Zu\n", FUNC, sect_type, fspace->sect_cls[sect_type].serial_size);
+#endif /* QAK */
+
+                /* Insert section in free space manager, unless requested not to */
+                if(!(des_flags & H5FS_DESERIALIZE_NO_ADD))
+                    if(H5FS_sect_add(f, dxpl_id, fspace, new_sect, H5FS_ADD_DESERIALIZING, NULL) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, NULL, "can't add section to free space manager")
+            } /* end for */
+        } while(p < (buf + old_sect_size));
+
+        /* Sanity check */
+        HDassert((size_t)(p - buf) == old_sect_size);
+        HDassert(old_sect_size == fspace->sect_size);
+        HDassert(old_tot_sect_count == fspace->tot_sect_count);
+        HDassert(old_serial_sect_count == fspace->serial_sect_count);
+        HDassert(old_ghost_sect_count == fspace->ghost_sect_count);
+        HDassert(old_tot_space == fspace->tot_space);
+    } /* end if */
+
+    /* Set return value */
+    ret_value = sinfo;
+
+done:
+    if(buf)
+        H5FL_BLK_FREE(sect_block, buf);
+    if(!ret_value && sinfo)
+        (void)H5FS_cache_sinfo_dest(f, sinfo);
+
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FS_cache_sinfo_load() */ /*lint !e818 Can't make udata a pointer to const */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sinfo_serialize_sect_cb
+ *
+ * Purpose:	Skip list iterator callback to serialize free space sections
+ *              of a particular size
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, May  8, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sinfo_serialize_sect_cb(void *_item, void UNUSED *key, void *_udata)
+{
+    H5FS_section_class_t *sect_cls;     /* Class of section */
+    H5FS_section_info_t *sect= (H5FS_section_info_t *)_item;   /* Free space section to work on */
+    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_serialize_sect_cb)
+
+    /* Check arguments. */
+    HDassert(sect);
+    HDassert(udata->sinfo);
+    HDassert(udata->p);
+
+    /* Get section's class */
+    sect_cls = &udata->sinfo->fspace->sect_cls[sect->type];
+
+    /* Check if this section should be serialized (i.e. is not a ghost section) */
+    if(!(sect_cls->flags & H5FS_CLS_GHOST_OBJ)) {
+        /* The address of the section */
+        UINT64ENCODE_VAR(*udata->p, sect->addr, udata->sinfo->sect_off_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: sect->addr = %a\n", FUNC, sect->addr);
+#endif /* QAK */
+
+        /* The type of this section */
+        *(*udata->p)++ = (uint8_t)sect->type;
+#ifdef QAK
+HDfprintf(stderr, "%s: sect->type = %u\n", FUNC, (unsigned)sect->type);
+#endif /* QAK */
+
+        /* Call 'serialize' callback for this section */
+        if(sect_cls->serialize) {
+            if((*sect_cls->serialize)(sect_cls, sect, *udata->p) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTSERIALIZE, FAIL, "can't syncronize section")
+
+            /* Update offset in serialization buffer */
+            (*udata->p) += sect_cls->serial_size;
+        } /* end if */
+        else
+            HDassert(sect_cls->serial_size == 0);
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sinfo_serialize_sect_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sinfo_serialize_node_cb
+ *
+ * Purpose:	Skip list iterator callback to serialize free space sections
+ *              in a bin
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, May  8, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sinfo_serialize_node_cb(void *_item, void UNUSED *key, void *_udata)
+{
+    H5FS_node_t *fspace_node = (H5FS_node_t *)_item;   /* Free space size node to work on */
+    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_serialize_node_cb)
+
+    /* Check arguments. */
+    HDassert(fspace_node);
+    HDassert(udata->sinfo);
+    HDassert(udata->p);
+
+    /* Check if this node has any serializable sections */
+    if(fspace_node->serial_count > 0) {
+        /* The number of serializable sections of this node's size */
+        UINT64ENCODE_VAR(*udata->p, fspace_node->serial_count, udata->sect_cnt_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace_node->serial_count = %Zu\n", FUNC, fspace_node->serial_count);
+#endif /* QAK */
+
+        /* The size of the sections for this node */
+        UINT64ENCODE_VAR(*udata->p, fspace_node->sect_size, udata->sinfo->sect_len_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: sect_size = %Hu\n", FUNC, fspace_node->sect_size);
+#endif /* QAK */
+
+        /* Iterate through all the sections of this size */
+        HDassert(fspace_node->sect_list);
+        if(H5SL_iterate(fspace_node->sect_list, H5FS_sinfo_serialize_sect_cb, udata) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section nodes")
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sinfo_serialize_node_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_cache_sinfo_flush
+ *
+ * Purpose:	Flushes a dirty free space section info to disk.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		July 31 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_cache_sinfo_flush(H5F_t *f, hid_t dxpl_id, hbool_t destroy, haddr_t addr, H5FS_sinfo_t *sinfo)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_flush)
+#ifdef QAK
+HDfprintf(stderr, "%s: Flushing free space header, addr = %a, destroy = %u\n", FUNC, addr, (unsigned)destroy);
+#endif /* QAK */
+
+    /* check arguments */
+    HDassert(f);
+    HDassert(H5F_addr_defined(addr));
+    HDassert(sinfo);
+
+    if(sinfo->cache_info.is_dirty) {
+        H5FS_iter_ud_t udata;       /* User data for callbacks */
+        uint8_t	*buf = NULL;        /* Temporary raw data buffer */
+        uint8_t *p;                 /* Pointer into raw data buffer */
+        unsigned bin;               /* Current bin we are on */
+
+        /* Allocate temporary buffer */
+        if((buf = H5FL_BLK_MALLOC(sect_block, (size_t)sinfo->fspace->sect_size)) == NULL)
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed")
+
+        p = buf;
+
+        /* Magic number */
+        HDmemcpy(p, H5FS_SINFO_MAGIC, H5FS_SIZEOF_MAGIC);
+        p += H5FS_SIZEOF_MAGIC;
+
+        /* Version # */
+        *p++ = H5FS_SINFO_VERSION;
+
+        /* Metadata status flags */
+/* XXX: Set this? */
+        *p++ = 0;
+
+        /* Metadata checksum */
+/* XXX: Set this!  (After all the metadata is in the buffer) */
+        HDmemset(p, 0, 4);
+        p += 4;
+
+        /* Address of free space header for these sections */
+        H5F_addr_encode(f, &p, sinfo->fspace->addr);
+
+        /* Set up user data for iterator */
+        udata.sinfo = sinfo;
+        udata.p = &p;
+        udata.sect_cnt_size = MAX(1, (H5V_log2_gen(sinfo->fspace->serial_sect_count) + 7) / 8);
+#ifdef QAK
+HDfprintf(stderr, "%s: udata.sect_cnt_size = %u\n", FUNC, udata.sect_cnt_size);
+#endif /* QAK */
+
+        /* Iterate over all the bins */
+#ifdef QAK
+HDfprintf(stderr, "%s: Serializing section bins\n", FUNC);
+#endif /* QAK */
+        for(bin = 0; bin < sinfo->nbins; bin++) {
+            /* Check if there are any sections in this bin */
+            if(sinfo->bins[bin].bin_list) {
+                /* Iterate over list of section size nodes for bin */
+                if(H5SL_iterate(sinfo->bins[bin].bin_list, H5FS_sinfo_serialize_node_cb, &udata) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section size nodes")
+            } /* end if */
+        } /* end for */
+
+        /* Sanity check */
+        HDassert((size_t)(p - buf) == sinfo->fspace->sect_size);
+        HDassert(sinfo->fspace->sect_size <= sinfo->fspace->alloc_sect_size);
+#ifdef QAK
+HDfprintf(stderr, "%s: sinfo->fspace->sect_size = %Hu\n", FUNC, sinfo->fspace->sect_size);
+HDfprintf(stderr, "%s: sinfo->fspace->alloc_sect_size = %Hu\n", FUNC, sinfo->fspace->alloc_sect_size);
+#endif /* QAK */
+
+        /* Write buffer to disk */
+        if(H5F_block_write(f, H5FD_MEM_FSPACE_SINFO, sinfo->fspace->sect_addr, (size_t)sinfo->fspace->sect_size, dxpl_id, buf) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFLUSH, FAIL, "unable to save free space sections to disk")
+
+        H5FL_BLK_FREE(sect_block, buf);
+
+	sinfo->cache_info.is_dirty = FALSE;
+    } /* end if */
+
+    if(destroy)
+        if(H5FS_cache_sinfo_dest(f, sinfo) < 0)
+	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space section info")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_cache_sinfo_flush() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sinfo_free_sect_cb
+ *
+ * Purpose:	Free a size-tracking node for a bin
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, March 11, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sinfo_free_sect_cb(void *_sect, void UNUSED *key, void *op_data)
+{
+    H5FS_section_info_t *sect = (H5FS_section_info_t *)_sect;   /* Section to free */
+    const H5FS_sinfo_t *sinfo = (const H5FS_sinfo_t *)op_data;     /* Free space manager for section */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sinfo_free_sect_cb)
+
+    HDassert(sect);
+    HDassert(sinfo);
+
+    /* Call the section's class 'free' method on the section */
+    (*sinfo->fspace->sect_cls[sect->type].free)(sect);
+
+    FUNC_LEAVE_NOAPI(0)
+}   /* H5FS_sinfo_free_sect_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sinfo_free_node_cb
+ *
+ * Purpose:	Free a size-tracking node for a bin
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, March 11, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sinfo_free_node_cb(void *item, void UNUSED *key, void *op_data)
+{
+    H5FS_node_t *fspace_node = (H5FS_node_t *)item;       /* Temporary pointer to free space list node */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sinfo_free_node_cb)
+
+    HDassert(fspace_node);
+    HDassert(op_data);
+
+    /* Release the skip list for sections of this size */
+    H5SL_destroy(fspace_node->sect_list, H5FS_sinfo_free_sect_cb, op_data);
+
+    /* Release free space list node */
+    H5FL_FREE(H5FS_node_t, fspace_node);
+
+    FUNC_LEAVE_NOAPI(0)
+}   /* H5FS_sinfo_free_node_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_cache_sinfo_dest
+ *
+ * Purpose:	Destroys a free space section info in memory.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		July 31 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+/* ARGSUSED */
+herr_t
+H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo)
+{
+    unsigned u;                 /* Local index variable */
+    herr_t ret_value = SUCCEED; /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_dest)
+
+    /*
+     * Check arguments.
+     */
+    HDassert(sinfo);
+    HDassert(sinfo->fspace);
+    HDassert(sinfo->bins);
+
+    /* Clear out lists of nodes */
+    for(u = 0; u < sinfo->nbins; u++)
+        if(sinfo->bins[u].bin_list) {
+            H5SL_destroy(sinfo->bins[u].bin_list, H5FS_sinfo_free_node_cb, sinfo);
+            sinfo->bins[u].bin_list = NULL;
+        } /* end if */
+
+    /* Release bins for skip lists */
+    sinfo->bins = H5FL_SEQ_FREE(H5FS_bin_t, sinfo->bins);
+
+    /* Release skip list for merging sections */
+    if(sinfo->merge_list)
+        if(H5SL_close(sinfo->merge_list) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy section merging skip list")
+
+    /* Unpin the free space header in the cache */
+    /* (make certain this is last action with section info, to allow for header
+     *  disappearing immediately)
+     */
+    if(H5AC_unpin_entry(f, sinfo->fspace) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPIN, FAIL, "unable to unpin free space header")
+
+    /* Release free space section info */
+    H5FL_FREE(H5FS_sinfo_t, sinfo);
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FS_cache_sinfo_dest() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_cache_sinfo_clear
+ *
+ * Purpose:	Mark a free space section info in memory as non-dirty.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		July 31 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_cache_sinfo_clear(H5F_t *f, H5FS_sinfo_t *sinfo, hbool_t destroy)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_cache_sinfo_clear)
+
+    /*
+     * Check arguments.
+     */
+    HDassert(sinfo);
+
+    /* Reset the dirty flag.  */
+    sinfo->cache_info.is_dirty = FALSE;
+
+    if(destroy)
+        if(H5FS_cache_sinfo_dest(f, sinfo) < 0)
+	    HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to destroy free space section info")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* end H5FS_cache_sinfo_clear() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_cache_sinfo_size
+ *
+ * Purpose:	Compute the size in bytes of a free space section info
+ *		on disk, and return it in *size_ptr.  On failure,
+ *		the value of *size_ptr is undefined.
+ *
+ * Return:	Non-negative on success/Negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@ncsa.uiuc.edu
+ *		July 31 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_cache_sinfo_size(const H5F_t UNUSED *f, const H5FS_sinfo_t *sinfo, size_t *size_ptr)
+{
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_cache_sinfo_size)
+
+    /* check arguments */
+    HDassert(sinfo);
+    HDassert(size_ptr);
+
+    /* Set size value */
+    *size_ptr = sinfo->fspace->sect_size;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5FS_cache_sinfo_size() */
+
diff --git a/src/H5FSdbg.c b/src/H5FSdbg.c
index 69c0f80..72597b1 100644
--- a/src/H5FSdbg.c
+++ b/src/H5FSdbg.c
@@ -74,9 +74,9 @@
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5FS_hdr_debug
+ * Function:	H5FS_debug
  *
- * Purpose:	Prints debugging info about a free space header.
+ * Purpose:	Prints debugging info about a free space manager.
  *
  * Return:	Non-negative on success/Negative on failure
  *
@@ -87,12 +87,13 @@
  *-------------------------------------------------------------------------
  */
 herr_t
-H5FS_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
+H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth)
 {
-    H5FS_hdr_t	*hdr = NULL;            /* Free space header info */
+    H5FS_t	*fspace = NULL;         /* Free space header info */
+    H5FS_prot_t fs_prot;                /* Information for protecting free space manager */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(H5FS_hdr_debug, FAIL)
+    FUNC_ENTER_NOAPI(H5FS_debug, FAIL)
 
     /*
      * Check arguments.
@@ -103,10 +104,15 @@ H5FS_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
     HDassert(indent >= 0);
     HDassert(fwidth >= 0);
 
+    /* Initialize user data for protecting the free space manager */
+    fs_prot.nclasses = 0;
+    fs_prot.classes = NULL;
+    fs_prot.cls_init_udata = NULL;
+
     /*
      * Load the free space header.
      */
-    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, addr, NULL, NULL, H5AC_READ)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, addr, &fs_prot, NULL, H5AC_READ)))
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Print opening message */
@@ -117,50 +123,50 @@ H5FS_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent,
      */
     HDfprintf(stream, "%*s%-*s %s\n", indent, "", fwidth,
 	      "Free space client:",
-	      (hdr->client == H5FS_CLIENT_FHEAP_ID ? "Fractal heap" : "Unknown"));
+	      (fspace->client == H5FS_CLIENT_FHEAP_ID ? "Fractal heap" : "Unknown"));
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Total free space tracked:",
-	      hdr->tot_space);
+	      fspace->tot_space);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Total number of free space sections tracked:",
-	      hdr->tot_sect_count);
+	      fspace->tot_sect_count);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Number of serializable free space sections tracked:",
-	      hdr->serial_sect_count);
+	      fspace->serial_sect_count);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Number of ghost free space sections tracked:",
-	      hdr->ghost_sect_count);
+	      fspace->ghost_sect_count);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 	      "Number of free space section classes:",
-	      hdr->nclasses);
+	      fspace->nclasses);
     HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth,
 	      "Shrink percent:",
-	      hdr->shrink_percent);
+	      fspace->shrink_percent);
     HDfprintf(stream, "%*s%-*s %u%%\n", indent, "", fwidth,
 	      "Expand percent:",
-	      hdr->expand_percent);
+	      fspace->expand_percent);
     HDfprintf(stream, "%*s%-*s %u\n", indent, "", fwidth,
 	      "# of bits for section address space:",
-	      hdr->max_sect_addr);
+	      fspace->max_sect_addr);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Maximum section size:",
-	      hdr->max_sect_size);
+	      fspace->max_sect_size);
     HDfprintf(stream, "%*s%-*s %a\n", indent, "", fwidth,
 	      "Serialized sections address:",
-	      hdr->sect_addr);
+	      fspace->sect_addr);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Serialized sections size used:",
-	      hdr->sect_size);
+	      fspace->sect_size);
     HDfprintf(stream, "%*s%-*s %Hu\n", indent, "", fwidth,
 	      "Serialized sections size allocated:",
-	      hdr->alloc_sect_size);
+	      fspace->alloc_sect_size);
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, addr, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5FS_hdr_debug() */
+} /* end H5FS_debug() */
 
 
 /*-------------------------------------------------------------------------
@@ -219,7 +225,8 @@ herr_t
 H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent, int fwidth,
     haddr_t fs_addr, haddr_t client_addr)
 {
-    H5FS_hdr_t	*hdr = NULL;            /* Free space header info */
+    H5FS_t	*fspace = NULL;         /* Free space header info */
+    H5FS_prot_t fs_prot;                /* Information for protecting free space manager */
     H5FS_client_t client;               /* The client of the free space */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
@@ -236,19 +243,24 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
     HDassert(H5F_addr_defined(fs_addr));
     HDassert(H5F_addr_defined(client_addr));
 
+    /* Initialize user data for protecting the free space manager */
+    fs_prot.nclasses = 0;
+    fs_prot.classes = NULL;
+    fs_prot.cls_init_udata = NULL;
+
     /*
      * Load the free space header.
      */
-    if(NULL == (hdr = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, NULL, NULL, H5AC_READ)))
+    if(NULL == (fspace = H5AC_protect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, &fs_prot, NULL, H5AC_READ)))
 	HGOTO_ERROR(H5E_FSPACE, H5E_CANTLOAD, FAIL, "unable to load free space header")
 
     /* Retrieve the client id */
-    client = hdr->client;
+    client = fspace->client;
 
     /* Release the free space header */
-    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
-    hdr = NULL;
+    fspace = NULL;
 
     /* Print opening message */
     HDfprintf(stream, "%*sFree Space Sections...\n", indent, "");
@@ -268,7 +280,7 @@ H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream, int indent
     } /* end switch */
 
 done:
-    if(hdr && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, hdr, H5AC__NO_FLAGS_SET) < 0)
+    if(fspace && H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_HDR, fs_addr, fspace, H5AC__NO_FLAGS_SET) < 0)
         HDONE_ERROR(H5E_FSPACE, H5E_PROTECT, FAIL, "unable to release free space header")
 
     FUNC_LEAVE_NOAPI(ret_value)
diff --git a/src/H5FSpkg.h b/src/H5FSpkg.h
index c3d9f1c..f90a737 100644
--- a/src/H5FSpkg.h
+++ b/src/H5FSpkg.h
@@ -27,11 +27,15 @@
 #ifndef _H5FSpkg_H
 #define _H5FSpkg_H
 
+/* Uncomment this macro to enable extra sanity checking */
+/* #define H5FS_DEBUG */
+
 /* Get package's private header */
 #include "H5FSprivate.h"	/* File free space                      */
 
 /* Other private headers needed by this file */
 #include "H5ACprivate.h"	/* Metadata cache			*/
+#include "H5SLprivate.h"	/* Skip lists				*/
 
 /**************************/
 /* Package Private Macros */
@@ -42,7 +46,7 @@
 
 /* Free space signatures */
 #define H5FS_HDR_MAGIC                  "FSHD"          /* Header */
-#define H5FS_SECTS_MAGIC                "FSSS"          /* Serialized sections */
+#define H5FS_SINFO_MAGIC                "FSSE"          /* Serialized sections */
 
 /* "Standard" size of prefix information for free space metadata */
 #define H5FS_METADATA_PREFIX_SIZE (                                           \
@@ -73,22 +77,79 @@
     + H5F_SIZEOF_SIZE(f) /* Allocated size of serialized free space sections */ \
     )
 
+/* Size of the free space serialized sections on disk */
+#define H5FS_SINFO_PREFIX_SIZE(f) (                                           \
+    /* General metadata fields */                                             \
+    H5FS_METADATA_PREFIX_SIZE                                                 \
+                                                                              \
+    /* Free space serialized sections specific fields */                      \
+    + H5F_SIZEOF_ADDR(f) /* Address of free space header for these sections */ \
+    )
+
+
 /****************************/
 /* Package Private Typedefs */
 /****************************/
 
-/* Free space header info */
-typedef struct H5FS_hdr_t {
+/* Information for protecting a free space manager header */
+typedef struct H5FS_prot_t {
+    size_t nclasses;                            /* Number of section classes */
+    const H5FS_section_class_t **classes;       /* Array of section class info */
+    void *cls_init_udata;                       /* Pointer to class init user data */
+} H5FS_prot_t;
+
+/* Free space section bin info */
+typedef struct H5FS_bin_t {
+    size_t tot_sect_count;      /* Total # of sections in this bin */
+    size_t serial_sect_count;   /* # of serializable sections in this bin */
+    size_t ghost_sect_count;    /* # of un-serializable sections in this bin */
+    H5SL_t *bin_list;           /* Skip list of differently sized sections */
+} H5FS_bin_t;
+
+/* Free space node for free space sections of the same size */
+typedef struct H5FS_node_t {
+    hsize_t sect_size;          /* Size of all sections on list */
+    size_t serial_count;        /* # of serializable sections on list */
+    size_t ghost_count;         /* # of un-serializable sections on list */
+    H5SL_t *sect_list;          /* Skip list to hold pointers to actual free list section node */
+} H5FS_node_t;
+
+/* Information about sections managed */
+typedef struct H5FS_sinfo_t {
     /* Information for H5AC cache functions, _must_ be first field in structure */
     H5AC_info_t cache_info;
 
-    /* Statistics */
+/* Stored information */
+    H5FS_bin_t *bins;           /* Array of lists of lists of free sections   */
+
+/* Computed/cached values */
+    unsigned nbins;             /* Number of bins                             */
+    size_t serial_size;         /* Total size of all serializable sections    */
+    size_t tot_size_count;      /* Total number of differently sized sections */
+    size_t serial_size_count;   /* Total number of differently sized serializable sections */
+    size_t ghost_size_count;    /* Total number of differently sized un-serializable sections */
+    unsigned sect_prefix_size;  /* Size of the section serialization prefix (in bytes) */
+    unsigned sect_off_size;     /* Size of a section offset (in bytes)        */
+    unsigned sect_len_size;     /* Size of a section length (in bytes)        */
+    H5FS_t *fspace;             /* Pointer to free space manager that owns sections */
+
+/* Memory data structures (not stored directly) */
+    H5SL_t *merge_list;         /* Skip list to hold sections for detecting merges */
+} H5FS_sinfo_t;
+
+/* Main free space info */
+struct H5FS_t {
+    /* Information for H5AC cache functions, _must_ be first field in structure */
+    H5AC_info_t cache_info;
+
+/* Stored information */
+    /* Statistics about sections managed */
     hsize_t tot_space;          /* Total amount of space tracked              */
     hsize_t tot_sect_count;     /* Total # of sections tracked                */
     hsize_t serial_sect_count;  /* # of serializable sections tracked         */
     hsize_t ghost_sect_count;   /* # of un-serializable sections tracked      */
 
-    /* Creation information */
+    /* Creation parameters */
     H5FS_client_t client;       /* Type of user of this free space manager    */
     unsigned nclasses;          /* Number of section classes handled          */
     unsigned shrink_percent;    /* Percent of "normal" serialized size to shrink serialized space at */
@@ -96,43 +157,17 @@ typedef struct H5FS_hdr_t {
     unsigned max_sect_addr;     /* Size of address space free sections are within (log2 of actual value) */
     hsize_t max_sect_size;      /* Maximum size of section to track */
 
-    /* Serialized space information */
+    /* Serialized section information */
     haddr_t sect_addr;          /* Address of the section info in the file    */
     hsize_t sect_size;          /* Size of the section info in the file       */
     hsize_t alloc_sect_size;    /* Allocated size of the section info in the file */
-} H5FS_hdr_t;
-
-/* Free space section bin info */
-typedef struct H5FS_bin_t {
-    size_t tot_sect_count;      /* Total # of sections in this bin */
-    size_t serial_sect_count;   /* # of serializable sections in this bin */
-    size_t ghost_sect_count;    /* # of un-serializable sections in this bin */
-    H5SL_t *bin_list;           /* Skip list of differently sized sections */
-} H5FS_bin_t;
-
-/* Main free space info */
-struct H5FS_t {
-    /* Stored values (from header) */
-    H5FS_hdr_t *hdr;            /* Pointer to header info                     */
 
-    /* Computed/cached values */
+/* Computed/cached values */
     haddr_t addr;               /* Address of free space header on disk       */
-    unsigned nbins;             /* Number of bins                             */
-    size_t serial_size;         /* Total size of all serializable sections    */
-    size_t tot_size_count;      /* Total number of differently sized sections */
-    size_t serial_size_count;   /* Total number of differently sized serializable sections */
-    size_t ghost_size_count;    /* Total number of differently sized un-serializable sections */
-    unsigned sect_prefix_size;  /* Size of the section serialization prefix (in bytes) */
-    unsigned sect_off_size;     /* Size of a section offset (in bytes)        */
-    unsigned sect_len_size;     /* Size of a section length (in bytes)        */
-    hbool_t must_deserialize;   /* Sections must be deserialized              */
-    hbool_t dirty;              /* Space information is dirty                 */
+    H5FS_sinfo_t *sinfo;        /* Section information                        */
 
-    /* Memory data structures (not stored directly) */
+/* Memory data structures (not stored directly) */
     H5FS_section_class_t *sect_cls; /* Array of section classes for this free list */
-    H5FS_section_info_t *single; /* Section information when free list has only one free section */
-    H5SL_t *merge_list;         /* Skip list to hold sections for detecting merges */
-    H5FS_bin_t *bins;           /* Array of lists of lists of free sections   */
 };
 
 
@@ -143,22 +178,45 @@ struct H5FS_t {
 /* H5FS header inherits cache-like properties from H5AC */
 H5_DLLVAR const H5AC_class_t H5AC_FSPACE_HDR[1];
 
-/* Declare a free list to manage the H5FS_hdr_t struct */
-H5FL_EXTERN(H5FS_hdr_t);
+/* H5FS section info inherits cache-like properties from H5AC */
+H5_DLLVAR const H5AC_class_t H5AC_FSPACE_SINFO[1];
+
+/* Declare a free list to manage the H5FS_node_t struct */
+H5FL_EXTERN(H5FS_node_t);
+
+/* Declare a free list to manage the H5FS_bin_t sequence information */
+H5FL_SEQ_EXTERN(H5FS_bin_t);
+
+/* Declare a free list to manage the H5FS_sinfo_t struct */
+H5FL_EXTERN(H5FS_sinfo_t);
+
+/* Declare a free list to manage the H5FS_t struct */
+H5FL_EXTERN(H5FS_t);
 
 
 /******************************/
 /* Package Private Prototypes */
 /******************************/
 
+/* Free space manager header routines */
+H5_DLL H5FS_t *H5FS_new(size_t nclasses, const H5FS_section_class_t *classes[],
+    void *cls_init_udata);
+
+/* Free space section routines */
+H5_DLL H5FS_sinfo_t *H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace);
+
 /* Debugging routines for dumping file structures */
-H5_DLL herr_t H5FS_hdr_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
+H5_DLL herr_t H5FS_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     FILE *stream, int indent, int fwidth);
 H5_DLL herr_t H5FS_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr,
     FILE *stream, int indent, int fwidth, haddr_t fs_addr, haddr_t client_addr);
 
 /* Metadata cache callbacks */
-H5_DLL herr_t H5FS_cache_hdr_dest(H5F_t *f, H5FS_hdr_t *hdr);
+H5_DLL herr_t H5FS_cache_hdr_dest(H5F_t *f, H5FS_t *hdr);
+H5_DLL herr_t H5FS_cache_sinfo_dest(H5F_t *f, H5FS_sinfo_t *sinfo);
+
+/* Sanity check routines */
+H5_DLL herr_t H5FS_sect_assert(const H5FS_t *fspace);
 
 #endif /* _H5FSpkg_H */
 
diff --git a/src/H5FSprivate.h b/src/H5FSprivate.h
index dfbefa7..0b3b84b 100644
--- a/src/H5FSprivate.h
+++ b/src/H5FSprivate.h
@@ -32,7 +32,6 @@
 /* Private headers needed by this file */
 #include "H5Fprivate.h"		/* File access				*/
 #include "H5FLprivate.h"	/* Free Lists                           */
-#include "H5SLprivate.h"	/* Skip lists				*/
 
 /**************************/
 /* Library Private Macros */
@@ -151,29 +150,31 @@ H5FL_SEQ_EXTERN(H5FS_section_class_t);
 /***************************************/
 /* Library-private Function Prototypes */
 /***************************************/
+
+/* Free space manager routines */
 H5_DLL H5FS_t *H5FS_create(H5F_t *f, hid_t dxpl_id, haddr_t *fs_addr,
     const H5FS_create_t *fs_create, size_t nclasses,
     const H5FS_section_class_t *classes[], void *cls_init_udata);
 H5_DLL H5FS_t *H5FS_open(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr,
     size_t nclasses, const H5FS_section_class_t *classes[], void *cls_init_udata);
-H5_DLL herr_t H5FS_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+H5_DLL herr_t H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr);
+H5_DLL herr_t H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
+
+/* Free space section routines */
+H5_DLL herr_t H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
     H5FS_section_info_t *node, unsigned flags, void *op_data);
-H5_DLL herr_t H5FS_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+H5_DLL herr_t H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
     H5FS_section_info_t *node);
-H5_DLL htri_t H5FS_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+H5_DLL htri_t H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
     hsize_t request, H5FS_section_info_t **node);
-H5_DLL herr_t H5FS_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, void *op_data);
+H5_DLL herr_t H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, void *op_data);
 H5_DLL herr_t H5FS_get_sect_count(const H5FS_t *fspace, hsize_t *nsects);
-H5_DLL herr_t H5FS_sect_change_class(H5FS_t *fspace, H5FS_section_info_t *sect,
-    unsigned new_class);
-H5_DLL herr_t H5FS_flush(H5F_t *f, hid_t dxpl_id, unsigned flags);
-H5_DLL herr_t H5FS_delete(H5F_t *f, hid_t dxpl_id, haddr_t fs_addr);
-H5_DLL herr_t H5FS_close(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
+H5_DLL herr_t H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t *sect, unsigned new_class);
 
 /* Debugging routines for dumping file structures */
 H5_DLL herr_t H5FS_sect_debug(const H5FS_t *fspace, const H5FS_section_info_t *sect,
     FILE *stream, int indent, int fwidth);
 
-H5_DLL herr_t H5FS_debug_test(const H5FS_t *fspace);
 #endif /* _H5FSprivate_H */
 
diff --git a/src/H5FSsection.c b/src/H5FSsection.c
new file mode 100644
index 0000000..5de42d8
--- /dev/null
+++ b/src/H5FSsection.c
@@ -0,0 +1,1899 @@
+/* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ * Copyright by the Board of Trustees of the University of Illinois.         *
+ * All rights reserved.                                                      *
+ *                                                                           *
+ * This file is part of HDF5.  The full HDF5 copyright notice, including     *
+ * terms governing use, modification, and redistribution, is contained in    *
+ * the files COPYING and Copyright.html.  COPYING can be found at the root   *
+ * of the source code distribution tree; Copyright.html can be found at the  *
+ * root level of an installed copy of the electronic HDF5 document set and   *
+ * is linked from the top-level documents page.  It can also be found at     *
+ * http://hdf.ncsa.uiuc.edu/HDF5/doc/Copyright.html.  If you do not have     *
+ * access to either file, you may request a copy from hdfhelp@ncsa.uiuc.edu. *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
+
+/*
+ * Programmer:	Quincey Koziol <koziol@hdfgroup.org>
+ *              Monday, July 31, 2006
+ *
+ * Purpose:	Free space tracking functions.
+ *
+ */
+
+/****************/
+/* Module Setup */
+/****************/
+
+#define H5FS_PACKAGE		/*suppress error about including H5FSpkg  */
+
+/***********/
+/* Headers */
+/***********/
+#include "H5private.h"		/* Generic Functions			*/
+#include "H5Eprivate.h"		/* Error handling		  	*/
+#include "H5FSpkg.h"		/* File free space			*/
+#include "H5MFprivate.h"	/* File memory management		*/
+#include "H5Vprivate.h"		/* Vectors and arrays 			*/
+
+/****************/
+/* Local Macros */
+/****************/
+
+/* Default starting size of section buffer */
+#define H5FS_SINFO_SIZE_DEFAULT  64
+
+/* Max. height of the skip list holding free list nodes */
+#define H5FS_DEFAULT_SKIPLIST_HEIGHT     16
+
+
+/******************/
+/* Local Typedefs */
+/******************/
+
+/* User data for skip list iterator callback for iterating over section size nodes */
+typedef struct {
+    H5FS_t *fspace;             /* Free space manager info */
+    H5FS_operator_t op;         /* Operator for the iteration */
+    void *op_data;              /* Information to pass to the operator */
+} H5FS_iter_ud_t;
+
+
+/********************/
+/* Package Typedefs */
+/********************/
+
+
+/********************/
+/* Local Prototypes */
+/********************/
+static herr_t H5FS_sect_increase(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    const H5FS_section_class_t *cls);
+static herr_t H5FS_sect_decrease(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    const H5FS_section_class_t *cls);
+static herr_t H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
+    const H5FS_section_class_t *cls);
+static herr_t H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
+    H5FS_section_info_t *sect);
+static herr_t H5FS_sect_unlink_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    const H5FS_section_class_t *cls, H5FS_section_info_t *sect);
+static herr_t H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
+    H5FS_section_info_t *sect);
+static herr_t H5FS_sect_link_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    const H5FS_section_class_t *cls, H5FS_section_info_t *sect);
+static herr_t H5FS_sect_link(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t *sect);
+static herr_t H5FS_sect_merge(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t **sect, void *op_data);
+static htri_t H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node);
+static herr_t H5FS_sect_serialize_size(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace);
+
+
+/*********************/
+/* Package Variables */
+/*********************/
+
+/* Declare a free list to manage the H5FS_node_t struct */
+H5FL_DEFINE(H5FS_node_t);
+
+/* Declare a free list to manage the H5FS_bin_t sequence information */
+H5FL_SEQ_DEFINE(H5FS_bin_t);
+
+/* Declare a free list to manage the H5FS_sinfo_t struct */
+H5FL_DEFINE(H5FS_sinfo_t);
+
+
+/*****************************/
+/* Library Private Variables */
+/*****************************/
+
+
+/*******************/
+/* Local Variables */
+/*******************/
+
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sinfo_new
+ *
+ * Purpose:	Create new section info structure
+ *
+ * Return:	Success:	non-NULL, pointer to new section info struct
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, July 31, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+H5FS_sinfo_t *
+H5FS_sinfo_new(H5F_t *f, H5FS_t *fspace)
+{
+    H5FS_sinfo_t *sinfo = NULL; /* Section information struct created */
+    H5FS_sinfo_t *ret_value;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_new)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(fspace);
+
+    /* Allocate the free space header */
+    if(NULL == (sinfo = H5FL_CALLOC(H5FS_sinfo_t)))
+	HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed")
+
+    /* Set non-zero values */
+    sinfo->nbins = H5V_log2_gen(fspace->max_sect_size);
+    sinfo->sect_prefix_size = H5FS_SINFO_PREFIX_SIZE(f);
+    sinfo->sect_off_size = (fspace->max_sect_addr + 7) / 8;
+    sinfo->sect_len_size = (H5V_log2_gen(fspace->max_sect_size) + 7) / 8;
+    sinfo->fspace = fspace;
+#ifdef QAK
+HDfprintf(stderr, "%s: sinfo->nbins = %u\n", FUNC, sinfo->nbins);
+HDfprintf(stderr, "%s: sinfo->sect_off_size = %u, sinfo->sect_len_size = %u\n", FUNC, sinfo->sect_off_size, sinfo->sect_len_size);
+#endif /* QAK */
+
+    /* Allocate space for the section size bins */
+    if(NULL == (sinfo->bins = H5FL_SEQ_CALLOC(H5FS_bin_t, sinfo->nbins)))
+        HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, NULL, "memory allocation failed for free space section bin array")
+
+    /* Set return value */
+    ret_value = sinfo;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sinfo_new() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sinfo_pin
+ *
+ * Purpose:	Pin the section info for the free space manager in memory
+ *              Either loads section info from disk, or creates new section info
+ *
+ * Return:	Success:	non-NULL, pointer to section info struct
+ *		Failure:	NULL
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, July 31, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static H5FS_sinfo_t *
+H5FS_sinfo_pin(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
+{
+    H5FS_sinfo_t *sinfo;        /* Section information struct created */
+    H5FS_sinfo_t *ret_value;    /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sinfo_pin)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(fspace);
+
+    /* Create new section info, if it doesn't exist yet */
+    if(!H5F_addr_defined(fspace->sect_addr)) {
+        /* Sanity check */
+        HDassert(fspace->tot_sect_count == 0);
+        HDassert(fspace->serial_sect_count == 0);
+        HDassert(fspace->ghost_sect_count == 0);
+
+        /* Allocate and initialize free space section info */
+        if(NULL == (sinfo = H5FS_sinfo_new(f, fspace)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, NULL, "can't create section info")
+
+        /* Allocate space for the section info */
+        fspace->sect_size = H5FS_SINFO_SIZE_DEFAULT;
+        fspace->alloc_sect_size = (size_t)fspace->sect_size;
+        if(HADDR_UNDEF == (fspace->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, fspace->alloc_sect_size)))
+            HGOTO_ERROR(H5E_STORAGE, H5E_NOSPACE, NULL, "file allocation failed for free space sections")
+
+        /* Cache the new free space section info */
+        if(H5AC_set(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, sinfo, H5AC__NO_FLAGS_SET) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINIT, NULL, "can't add free space sections to cache")
+        sinfo = NULL;
+
+        /* Mark free space header as dirty */
+        if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, NULL, "unable to mark free space header as dirty")
+    } /* end if */
+
+    /* Protect the free space sections */
+    if(NULL == (sinfo = H5AC_protect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, NULL, fspace, H5AC_WRITE)))
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTPROTECT, NULL, "unable to load free space sections")
+
+    /* Pin them in the cache */
+    if(H5AC_pin_protected_entry(f, sinfo) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTPIN, NULL, "unable to pin free space sections")
+
+    /* Unlock free space sections, now pinned */
+    if(H5AC_unprotect(f, dxpl_id, H5AC_FSPACE_SINFO, fspace->sect_addr, sinfo, H5AC__NO_FLAGS_SET) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTUNPROTECT, NULL, "unable to release free space sections")
+
+    /* Update pointer to free space header for section info */
+    sinfo->fspace = fspace;
+
+    /* Set return value */
+    ret_value = sinfo;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sinfo_pin() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_increase
+ *
+ * Purpose:	Increase the size of the serialized free space section info
+ *              on disk
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, May  8, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_increase(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    const H5FS_section_class_t *cls)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_increase)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(cls);
+
+    /* Increment total # of sections on free space list */
+    fspace->tot_sect_count++;
+
+    /* Check for serializable or 'ghost' section */
+    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+        /* Sanity check */
+        HDassert(cls->serial_size == 0);
+
+        /* Increment # of ghost sections */
+        fspace->ghost_sect_count++;
+    } /* end if */
+    else {
+        /* Increment # of serializable sections */
+        fspace->serial_sect_count++;
+
+        /* Increment amount of space required to serialize all sections */
+#ifdef QAK
+HDfprintf(stderr, "%s: sinfo->serial_size = %Zu\n", FUNC, sinfo->serial_size);
+HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
+#endif /* QAK */
+        fspace->sinfo->serial_size += cls->serial_size;
+
+        /* Update the free space sections' serialized size */
+        if(H5FS_sect_serialize_size(f, dxpl_id, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
+    } /* end else */
+
+    /* Mark free space header as dirty */
+    if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_increase() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_decrease
+ *
+ * Purpose:	Decrease the size of the serialized free space section info
+ *              on disk
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, May  8, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_decrease(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, const H5FS_section_class_t *cls)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_decrease)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(cls);
+
+    /* Decrement total # of sections in free space manager */
+    fspace->tot_sect_count--;
+
+    /* Check for serializable or 'ghost' section */
+    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+        /* Sanity check */
+        HDassert(cls->serial_size == 0);
+
+        /* Decrement # of ghost sections */
+        fspace->ghost_sect_count--;
+    } /* end if */
+    else {
+        /* Decrement # of serializable sections */
+        fspace->serial_sect_count--;
+
+        /* Decrement amount of space required to serialize all sections */
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->serial_size = %Zu\n", FUNC, fspace->serial_size);
+HDfprintf(stderr, "%s: cls->serial_size = %Zu\n", FUNC, cls->serial_size);
+#endif /* QAK */
+        fspace->sinfo->serial_size -= cls->serial_size;
+
+        /* Update the free space sections' serialized size */
+        if(H5FS_sect_serialize_size(f, dxpl_id, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
+    } /* end else */
+
+    /* Mark free space header as dirty */
+    if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_decrease() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_size_node_decr
+ *
+ * Purpose:	Decrement the number of sections of a particular size
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_size_node_decr(H5FS_sinfo_t *sinfo, unsigned bin, H5FS_node_t *fspace_node,
+    const H5FS_section_class_t *cls)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_size_node_decr)
+
+    /* Check arguments. */
+    HDassert(sinfo);
+    HDassert(fspace_node);
+    HDassert(cls);
+
+    /* Decrement the # of sections in this bin */
+    /* (Different from the # of items in the bin's skiplist, since each node on
+     *  the bin's skiplist is also a skiplist...)
+     */
+    sinfo->bins[bin].tot_sect_count--;
+#ifdef QAK
+HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bins[bin].sect_count);
+#endif /* QAK */
+
+    /* Check for 'ghost' or 'serializable' section */
+    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+        /* Decrement node's ghost section count */
+        fspace_node->ghost_count--;
+
+        /* Decrement bin's ghost section count */
+        sinfo->bins[bin].ghost_sect_count--;
+
+        /* If the node has no more ghost sections, decrement number of ghost section sizes managed */
+        if(fspace_node->ghost_count == 0)
+            sinfo->ghost_size_count--;
+    } /* end if */
+    else {
+        /* Decrement node's serializable section count */
+        fspace_node->serial_count--;
+
+        /* Decrement bin's serializable section count */
+        sinfo->bins[bin].serial_sect_count--;
+
+        /* If the node has no more serializable sections, decrement number of serializable section sizes managed */
+        if(fspace_node->serial_count == 0)
+            sinfo->serial_size_count--;
+    } /* end else */
+
+    /* Check for no more nodes on list of that size */
+    if(H5SL_count(fspace_node->sect_list) == 0) {
+        H5FS_node_t *tmp_fspace_node;       /* Free space list size node */
+
+        /* Sanity checks */
+        HDassert(fspace_node->ghost_count == 0);
+        HDassert(fspace_node->serial_count == 0);
+
+        /* Remove size tracking list from bin */
+        tmp_fspace_node = H5SL_remove(sinfo->bins[bin].bin_list, &fspace_node->sect_size);
+        if(tmp_fspace_node == NULL || tmp_fspace_node != fspace_node)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
+
+        /* Destroy skip list for size tracking node */
+        if(H5SL_close(fspace_node->sect_list) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCLOSEOBJ, FAIL, "can't destroy size tracking node's skip list")
+
+        /* Release free space list node */
+        H5FL_FREE(H5FS_node_t, fspace_node);
+
+        /* Decrement total number of section sizes managed */
+        sinfo->tot_size_count--;
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_size_node_decr() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_unlink_size
+ *
+ * Purpose:	Remove a section node from size tracking data structures for
+ *              a free space manager
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_unlink_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
+    H5FS_section_info_t *sect)
+{
+    H5FS_node_t *fspace_node;       /* Free list size node */
+    H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
+    unsigned bin;                   /* Bin to put the free space section in */
+    herr_t ret_value = SUCCEED;     /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_size)
+
+    /* Check arguments. */
+    HDassert(sinfo);
+    HDassert(sinfo->bins);
+    HDassert(sect);
+    HDassert(cls);
+
+    /* Determine correct bin which holds items of at least the section's size */
+    bin = H5V_log2_gen(sect->size);
+    HDassert(bin < sinfo->nbins);
+    if(sinfo->bins[bin].bin_list == NULL)
+        HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "node's bin is empty?")
+
+    /* Find space node for section's size */
+    if((fspace_node = H5SL_search(sinfo->bins[bin].bin_list, &sect->size)) == NULL)
+        HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section size node")
+
+    /* Remove the section's node from the list */
+    tmp_sect_node = H5SL_remove(fspace_node->sect_list, &sect->addr);
+    if(tmp_sect_node == NULL || tmp_sect_node != sect)
+        HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
+
+    /* Decrement # of sections in section size node */
+    if(H5FS_size_node_decr(sinfo, bin, fspace_node, cls) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_unlink_size() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_unlink_rest
+ *
+ * Purpose:	Finish unlinking a section from the rest of the free space
+ *              manager's data structures, after the section has been removed
+ *              from the size tracking data structures
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_unlink_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    const H5FS_section_class_t *cls, H5FS_section_info_t *sect)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_unlink_rest)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(cls);
+    HDassert(sect);
+
+    /* Remove node from merge list, if it was entered there */
+    if(!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
+        H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
+
+#ifdef QAK
+HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+#endif /* QAK */
+        tmp_sect_node = H5SL_remove(fspace->sinfo->merge_list, &sect->addr);
+        if(tmp_sect_node == NULL || tmp_sect_node != sect)
+            HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
+    } /* end if */
+
+    /* Update section info & check if we need less room for the serialized free space sections */
+    if(H5FS_sect_decrease(f, dxpl_id, fspace, cls) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't increase free space section size on disk")
+
+    /* Decrement amount of free space managed */
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+#endif /* QAK */
+    fspace->tot_space -= sect->size;
+
+    /* Mark free space sections as changed */
+    if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace->sinfo) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_unlink_rest() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_remove
+ *
+ * Purpose:	Remove a section from the free space manager
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FS_sect_remove(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t *sect)
+{
+    const H5FS_section_class_t *cls;    /* Class of section */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_remove)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(sect);
+
+    /* Get section's class */
+    cls = &fspace->sect_cls[sect->type];
+
+    /* Remove node from size tracked data structures */
+    if(H5FS_sect_unlink_size(fspace->sinfo, cls, sect) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from size tracking data structures")
+
+    /* Update rest of free space manager data structures for node removal */
+    if(H5FS_sect_unlink_rest(f, dxpl_id, fspace, cls, sect) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_remove() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_link_size
+ *
+ * Purpose:	Add a section of free space to the free list bins
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, March 20, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_link_size(H5FS_sinfo_t *sinfo, const H5FS_section_class_t *cls,
+    H5FS_section_info_t *sect)
+{
+    H5FS_node_t *fspace_node = NULL;     /* Pointer to free space node of the correct size */
+    unsigned bin;                       /* Bin to put the free space section in */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_size)
+#ifdef QAK
+HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a\n", FUNC, sect->size, sect->addr);
+#endif /* QAK */
+
+    /* Check arguments. */
+    HDassert(sinfo);
+    HDassert(sect);
+    HDassert(H5F_addr_defined(sect->addr));
+    HDassert(sect->size);
+
+    /* Determine correct bin which holds items of the section's size */
+    bin = H5V_log2_gen(sect->size);
+    HDassert(bin < sinfo->nbins);
+    if(sinfo->bins[bin].bin_list == NULL) {
+        if(NULL == (sinfo->bins[bin].bin_list = H5SL_create(H5SL_TYPE_HSIZE, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for free space nodes")
+    } /* end if */
+    else {
+        /* Check for node list of the correct size already */
+        fspace_node = H5SL_search(sinfo->bins[bin].bin_list, &sect->size);
+    } /* end else */
+
+    /* Check if we need to create a new skip list for nodes of this size */
+    if(fspace_node == NULL) {
+        /* Allocate new free list size node */
+        if(NULL == (fspace_node = H5FL_MALLOC(H5FS_node_t)))
+            HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "memory allocation failed for free space node")
+
+        /* Initialize the free list size node */
+        fspace_node->sect_size = sect->size;
+        fspace_node->serial_count = fspace_node->ghost_count = 0;
+        if(NULL == (fspace_node->sect_list = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for free space nodes")
+
+        /* Insert new free space size node into bin's list */
+        if(H5SL_insert(sinfo->bins[bin].bin_list, fspace_node, &fspace_node->sect_size) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
+
+        /* Increment number of section sizes */
+        sinfo->tot_size_count++;
+    } /* end if */
+
+    /* Increment # of section in bin */
+    /* (Different from the # of items in the bin's skiplist, since each node on
+     *  the bin's skiplist is also a skiplist...)
+     */
+#ifdef QAK
+HDfprintf(stderr, "%s: sinfo->bins[%u].sect_count = %Zu\n", FUNC, bin, sinfo->bins[bin].sect_count);
+#endif /* QAK */
+    sinfo->bins[bin].tot_sect_count++;
+    if(cls->flags & H5FS_CLS_GHOST_OBJ) {
+        sinfo->bins[bin].ghost_sect_count++;
+        fspace_node->ghost_count++;
+
+        /* Check for first ghost section in node */
+        if(fspace_node->ghost_count == 1)
+            sinfo->ghost_size_count++;
+    } /* end if */
+    else {
+        sinfo->bins[bin].serial_sect_count++;
+        fspace_node->serial_count++;
+
+        /* Check for first serializable section in node */
+        if(fspace_node->serial_count == 1)
+            sinfo->serial_size_count++;
+    } /* end else */
+
+    /* Insert free space node into correct skip list */
+    if(H5SL_insert(fspace_node->sect_list, sect, &sect->addr) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into skip list")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_link_size() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_link_rest
+ *
+ * Purpose:	Link a section into the rest of the non-size tracking
+ *              free space manager data structures
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_link_rest(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, const H5FS_section_class_t *cls,
+    H5FS_section_info_t *sect)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link_rest)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(sect);
+
+    /* Add section to the address-ordered list of sections, if allowed */
+    if(!(cls->flags & H5FS_CLS_SEPAR_OBJ)) {
+#ifdef QAK
+HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+#endif /* QAK */
+        if(fspace->sinfo->merge_list == NULL)
+            if(NULL == (fspace->sinfo->merge_list = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for merging free space sections")
+        if(H5SL_insert(fspace->sinfo->merge_list, sect, &sect->addr) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into merging skip list")
+    } /* end if */
+
+    /* Update section info & check if we need more room for the serialized free space sections */
+    if(H5FS_sect_increase(f, dxpl_id, fspace, cls) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't increase free space section size on disk")
+
+    /* Increment amount of free space managed */
+    fspace->tot_space += sect->size;
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_link_rest() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_link
+ *
+ * Purpose:	Link a section into the internal data structures
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_link(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t *sect)
+{
+    const H5FS_section_class_t *cls;    /* Class of section */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_link)
+
+    /* Check arguments. */
+    HDassert(f);
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(sect);
+
+    /* Get section's class */
+    cls = &fspace->sect_cls[sect->type];
+
+    /* Add section to size tracked data structures */
+#ifdef QAK
+HDfprintf(stderr, "%s: Check 1.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+#endif /* QAK */
+    if(H5FS_sect_link_size(fspace->sinfo, cls, sect) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to size tracking data structures")
+
+#ifdef QAK
+HDfprintf(stderr, "%s: Check 2.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+#endif /* QAK */
+    /* Update rest of free space manager data structures for section addition */
+    if(H5FS_sect_link_rest(f, dxpl_id, fspace, cls, sect) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't add section to non-size tracking data structures")
+#ifdef QAK
+HDfprintf(stderr, "%s: Check 3.0 - fspace->tot_space = %Hu\n", FUNC, fspace->tot_space);
+#endif /* QAK */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_link() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_merge
+ *
+ * Purpose:	Attempt to merge a returned free space section with existing
+ *              free space.
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Wednesday, May 17, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_merge(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t **sect, void *op_data)
+{
+    H5FS_section_class_t *sect_cls;     /* Section's class */
+    H5FS_section_info_t *tmp_sect_node; /* Temporary free space section */
+    hbool_t modified;                   /* Flag to indicate merge or shrink occurred */
+    htri_t status;                      /* Status value */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_merge)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(*sect);
+    HDassert(H5F_addr_defined((*sect)->addr));
+    HDassert((*sect)->size);
+
+    /* Loop until no more merging */
+    if(fspace->sinfo->merge_list) {
+        do {
+            H5FS_section_class_t *tmp_sect_cls;     /* Temporary section's class */
+
+            /* Reset 'modification occurred' flag */
+            modified = FALSE;
+
+            /* Look for neighboring section before new section */
+            tmp_sect_node = H5SL_less(fspace->sinfo->merge_list, &(*sect)->addr);
+
+            /* Check for node before new node able to merge with new node */
+            if(tmp_sect_node) {
+                /* Get classes for right & left sections */
+                tmp_sect_cls = &fspace->sect_cls[tmp_sect_node->type];
+                sect_cls = &fspace->sect_cls[(*sect)->type];
+
+                /* Check if sections of the left most class can merge with sections
+                 *  of another class & whether the sections are the same type,
+                 *  then check for 'can merge' callback
+                 */
+                if((!(tmp_sect_cls->flags & H5FS_CLS_MERGE_SYM) || (tmp_sect_node->type == (*sect)->type))
+                        && tmp_sect_cls->can_merge) {
+                    /* Determine if the sections can merge */
+                    if((status = (*tmp_sect_cls->can_merge)(tmp_sect_node, *sect, op_data)) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for merging sections")
+                    if(status > 0) {
+                        /* Sanity check */
+                        HDassert(tmp_sect_cls->merge);
+
+                        /* Remove 'less than' node from data structures */
+                        if(H5FS_sect_remove(f, dxpl_id, fspace, tmp_sect_node) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+
+                        /* Merge the two sections together */
+                        if((*tmp_sect_cls->merge)(tmp_sect_node, *sect, op_data) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
+
+                        /* Retarget section pointer to 'less than' node that was merged into */
+                        *sect = tmp_sect_node;
+
+                        /* Indicate successful merge occurred */
+                        modified = TRUE;
+                    } /* end if */
+                } /* end if */
+            } /* end if */
+
+            /* Look for section after new (or merged) section */
+            tmp_sect_node = H5SL_greater(fspace->sinfo->merge_list, &(*sect)->addr);
+
+            /* Check for node after new node able to merge with new node */
+            if(tmp_sect_node) {
+                /* Get classes for right & left sections */
+                sect_cls = &fspace->sect_cls[(*sect)->type];
+                tmp_sect_cls = &fspace->sect_cls[tmp_sect_node->type];
+
+                /* Check if sections of the left most class can merge with sections
+                 *  of another class & whether the sections are the same type,
+                 *  then check for 'can merge' callback
+                 */
+                if((!(sect_cls->flags & H5FS_CLS_MERGE_SYM) || ((*sect)->type == tmp_sect_node->type))
+                        && sect_cls->can_merge) {
+
+                    /* Determine if the sections can merge */
+                    if((status = (*sect_cls->can_merge)(*sect, tmp_sect_node, op_data)) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't check for merging sections")
+                    if(status > 0) {
+                        /* Sanity check */
+                        HDassert(sect_cls->merge);
+
+                        /* Remove 'greater than' node from data structures */
+                        if(H5FS_sect_remove(f, dxpl_id, fspace, tmp_sect_node) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+
+                        /* Merge the two sections together */
+                        if((*sect_cls->merge)(*sect, tmp_sect_node, op_data) < 0)
+                            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't merge two sections")
+
+                        /* Indicate successful merge occurred */
+                        modified = TRUE;
+                    } /* end if */
+                } /* end if */
+            } /* end if */
+        } while(modified);
+    } /* end if */
+    HDassert(*sect);
+#ifdef QAK
+HDfprintf(stderr, "%s: Done merging, (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size, (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+#endif /* QAK */
+
+    /* Loop until no more shrinking */
+    do {
+        /* Reset 'modification occurred' flag */
+        modified = FALSE;
+
+        /* Check for (possibly merged) section able to shrink the size of the container */
+        sect_cls = &fspace->sect_cls[(*sect)->type];
+        if(sect_cls->can_shrink) {
+            if((status = (*sect_cls->can_shrink)(*sect, op_data)) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTSHRINK, FAIL, "can't check for shrinking container")
+            if(status > 0) {
+#ifdef QAK
+HDfprintf(stderr, "%s: Can shrink!\n", FUNC);
+#endif /* QAK */
+                /* Look for neighboring section before new section */
+                if(fspace->sinfo->merge_list) {
+                    tmp_sect_node = H5SL_less(fspace->sinfo->merge_list, &(*sect)->addr);
+
+                    /* Make certain there isn't a section after the new section */
+                    HDassert(H5SL_greater(fspace->sinfo->merge_list, &(*sect)->addr) == NULL);
+                } /* end if */
+                else
+                    tmp_sect_node = NULL;
+
+                /* Shrink the container */
+                /* (callback can indicate that it has discarded the section by setting *sect to NULL) */
+                HDassert(sect_cls->shrink);
+                if((*sect_cls->shrink)(sect, op_data) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't shrink free space container")
+
+                /* Check if the new section was removed */
+                if(*sect == NULL && tmp_sect_node) {
+                    /* Remove 'less than' node from data structures */
+                    if(H5FS_sect_remove(f, dxpl_id, fspace, tmp_sect_node) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTRELEASE, FAIL, "can't remove section from internal data structures")
+
+                    *sect = tmp_sect_node;
+                } /* end if */
+
+                /* Indicate successful merge occurred */
+                modified = TRUE;
+            } /* end if */
+        } /* end if */
+    } while(modified && *sect);
+#ifdef QAK
+HDfprintf(stderr, "%s: Done shrinking\n", FUNC);
+if(*sect)
+    HDfprintf(stderr, "%s: (*sect) = {%a, %Hu, %u, %s}\n", FUNC, (*sect)->addr, (*sect)->size, (*sect)->type, ((*sect)->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+else
+    HDfprintf(stderr, "%s: *sect = %p\n", FUNC, *sect);
+#endif /* QAK */
+
+done:
+#ifdef QAK
+HDfprintf(stderr, "%s: Leaving, ret_value = %d\n", FUNC, ret_value);
+#endif /* QAK */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_merge() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_add
+ *
+ * Purpose:	Add a section of free space to the free list
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Tuesday, March  7, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FS_sect_add(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_section_info_t *sect,
+    unsigned flags, void *op_data)
+{
+    H5FS_section_class_t *cls;          /* Section's class */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FS_sect_add, FAIL)
+
+#ifdef QAK
+HDfprintf(stderr, "%s: *sect = {%a, %Hu, %u, %s}\n", FUNC, sect->addr, sect->size, sect->type, (sect->state == H5FS_SECT_LIVE ? "H5FS_SECT_LIVE" : "H5FS_SECT_SERIALIZED"));
+#endif /* QAK */
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(sect);
+    HDassert(H5F_addr_defined(sect->addr));
+    HDassert(sect->size);
+
+    /* Check if we need to go get the sections */
+    if(fspace->sinfo == NULL) {
+        if(NULL == (fspace->sinfo = H5FS_sinfo_pin(f, dxpl_id, fspace)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't pin sections")
+    } /* end if */
+
+    /* Call "add" section class callback, if there is one */
+    cls = &fspace->sect_cls[sect->type];
+    if(cls->add) {
+        if((*cls->add)(sect, &flags, op_data) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "'add' section class callback failed")
+    } /* end if */
+
+    /* Check for merging returned space with existing section node */
+    if(flags & H5FS_ADD_RETURNED_SPACE) {
+#ifdef QAK
+HDfprintf(stderr, "%s: Returning space\n", FUNC);
+#endif /* QAK */
+
+        /* Attempt to merge returned section with existing sections */
+        if(H5FS_sect_merge(f, dxpl_id, fspace, &sect, op_data) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMERGE, FAIL, "can't merge sections")
+    } /* end if */
+
+    /* Add new (possibly merged) node to free sections data structures */
+    /* (If section has been completely merged or shrunk away, 'sect' will
+     *  be NULL at this point - QAK)
+     */
+    if(sect)
+        if(H5FS_sect_link(f, dxpl_id, fspace, sect) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space section into skip list")
+
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->hdr->tot_space = %Hu\n", FUNC, fspace->hdr->tot_space);
+#endif /* QAK */
+    /* Mark free space sections as changed */
+    /* (if adding sections while deserializing sections, don't set the flag) */
+    if(!(flags & H5FS_ADD_DESERIALIZING)) {
+        if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace->sinfo) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
+    } /* end if */
+
+done:
+#ifdef H5FS_DEBUG
+if(!(flags & (H5FS_ADD_DESERIALIZING | H5FS_ADD_SKIP_VALID)))
+    H5FS_assert(fspace);
+#endif /* H5FS_DEBUG */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_add() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_find_node
+ *
+ * Purpose:	Locate a section of free space (in existing free space list
+ *              bins) that is large enough to fulfill request.
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, March 20, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static htri_t
+H5FS_sect_find_node(H5FS_t *fspace, hsize_t request, H5FS_section_info_t **node)
+{
+    H5FS_node_t *fspace_node;        /* Free list size node */
+    unsigned bin;                   /* Bin to put the free space section in */
+    htri_t ret_value = FALSE;       /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_find_node)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(fspace->sinfo->bins);
+    HDassert(request > 0);
+    HDassert(node);
+
+    /* Determine correct bin which holds items of at least the section's size */
+    bin = H5V_log2_gen(request);
+    HDassert(bin < fspace->sinfo->nbins);
+    while(bin < fspace->sinfo->nbins && fspace->sinfo->bins[bin].bin_list == NULL)
+        bin++;
+
+    /* Find the first free space section that is large enough to fulfill request */
+    /* (Since the bins use skip lists to track the sizes of the address-ordered
+     *  lists, this is actually a "best fit" algorithm)
+     */
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->sinfo->nbins = %u\n", FUNC, fspace->sinfo->nbins);
+HDfprintf(stderr, "%s: bin = %u\n", FUNC, bin);
+#endif /* QAK */
+    if(bin < fspace->sinfo->nbins)
+        do {
+            /* Look for large enough free space section in this bin */
+            if(fspace->sinfo->bins[bin].bin_list)
+                /* Check for large enough list of sections on list */
+                if((fspace_node = H5SL_greater(fspace->sinfo->bins[bin].bin_list, &request))) {
+                    const H5FS_section_class_t *cls;    /* Class of section */
+
+                    /* Take first node off of the list (ie. node w/lowest address) */
+                    if(NULL == (*node = H5SL_remove_first(fspace_node->sect_list)))
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space node from skip list")
+
+                    /* Get section's class */
+                    cls = &fspace->sect_cls[(*node)->type];
+
+                    /* Decrement # of sections in section size node */
+                    if(H5FS_size_node_decr(fspace->sinfo, bin, fspace_node, cls) < 0)
+                        HGOTO_ERROR(H5E_FSPACE, H5E_CANTREMOVE, FAIL, "can't remove free space size node from skip list")
+
+                    /* Indicate that we found a node for the request */
+                    HGOTO_DONE(TRUE)
+                } /* end if */
+
+            /* Advance to next larger bin */
+            bin++;
+        } while(bin < fspace->sinfo->nbins);
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_find_node() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_find
+ *
+ * Purpose:	Locate a section of free space (in existing free space list) that
+ *              is large enough to fulfill request.
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Tuesday, March  7, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+htri_t
+H5FS_sect_find(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, hsize_t request,
+    H5FS_section_info_t **node)
+{
+    htri_t ret_value = FALSE;           /* Return value */
+
+    FUNC_ENTER_NOAPI(H5FS_sect_find, FAIL)
+
+#ifdef QAK
+HDfprintf(stderr, "%s: request = %Hu\n", FUNC, request);
+#endif /* QAK */
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(request);
+    HDassert(node);
+
+    /* Check if we need to go get the sections */
+    if(fspace->sinfo == NULL) {
+        if(NULL == (fspace->sinfo = H5FS_sinfo_pin(f, dxpl_id, fspace)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't pin sections")
+    } /* end if */
+
+    /* Check for any sections on free space list */
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->tot_sect_count = %Hu\n", FUNC, fspace->tot_sect_count);
+HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
+HDfprintf(stderr, "%s: fspace->ghost_sect_count = %Hu\n", FUNC, fspace->ghost_sect_count);
+#endif /* QAK */
+    if(fspace->tot_sect_count > 0) {
+        /* Look for node in bins */
+        if((ret_value = H5FS_sect_find_node(fspace, request, node)) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from bins")
+
+        /* Decrement # of sections on free list, if we found an object */
+        if(ret_value > 0) {
+            const H5FS_section_class_t *cls;    /* Class of section */
+
+            /* Get section's class */
+            cls = &fspace->sect_cls[(*node)->type];
+
+            /* Update rest of free space manager data structures for node removal */
+            if(H5FS_sect_unlink_rest(f, dxpl_id, fspace, cls, *node) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "can't remove section from non-size tracking data structures")
+#ifdef QAK
+HDfprintf(stderr, "%s: (*node)->size = %Hu, (*node)->addr = %a, (*node)->type = %u\n", FUNC, (*node)->size, (*node)->addr, (*node)->type);
+#endif /* QAK */
+        } /* end if */
+    } /* end if */
+
+done:
+#ifdef H5FS_DEBUG
+    H5FS_assert(fspace);
+#endif /* H5FS_DEBUG */
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_find() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_serialize_size
+ *
+ * Purpose:	Determine serialized size of all sections in free space manager
+ *              And adjust space on disk for storing serialized sections
+ *
+ * Return:	Success:	non-negative
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, May  8, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_sect_serialize_size(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace)
+{
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_serialize_size)
+
+    /* Check arguments. */
+    HDassert(fspace);
+
+    /* Compute the size of the buffer required to serialize all the sections */
+    if(fspace->serial_sect_count > 0) {
+        size_t sect_buf_size;               /* Section buffer size */
+
+        /* Serialized sections prefix */
+        sect_buf_size = fspace->sinfo->sect_prefix_size;
+
+        /* Count for each differently sized serializable section */
+#ifdef QAK
+    HDfprintf(stderr, "%s: fspace->sinfo->serial_size_count = %Zu\n", FUNC, fspace->sinfo->serial_size_count);
+    HDfprintf(stderr, "%s: fspace->serial_sect_count = %Hu\n", FUNC, fspace->serial_sect_count);
+#endif /* QAK */
+        sect_buf_size += fspace->sinfo->serial_size_count * MAX(1, ((H5V_log2_gen(fspace->serial_sect_count) + 7) / 8));
+
+        /* Size for each differently sized serializable section */
+        sect_buf_size += fspace->sinfo->serial_size_count * fspace->sinfo->sect_len_size;
+
+        /* Offsets of each section in address space */
+        sect_buf_size += fspace->serial_sect_count * fspace->sinfo->sect_off_size;
+
+        /* Class of each section */
+        sect_buf_size += fspace->serial_sect_count * 1;
+
+        /* Extra space required to serialize each section */
+        sect_buf_size += fspace->sinfo->serial_size;
+
+        /* Update section size in header */
+        fspace->sect_size = sect_buf_size;
+    } /* end if */
+    else
+        /* Reset section size in header */
+        fspace->sect_size = H5FS_SINFO_SIZE_DEFAULT;
+
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->hdr->sect_size = %Hu\n", FUNC, fspace->hdr->sect_size);
+HDfprintf(stderr, "%s: fspace->hdr->alloc_sect_size = %Hu\n", FUNC, fspace->hdr->alloc_sect_size);
+#endif /* QAK */
+    if(fspace->sect_size > fspace->alloc_sect_size) {
+        size_t new_size;        /* New size of space for serialized sections */
+        haddr_t old_addr;       /* Old address of serialized sections */
+
+/* Currently, the old block data is "thrown away" after the space is reallocated,
+ * so avoid data copy in H5MF_realloc() call by just free'ing the space and
+ * allocating new space.
+ *
+ * This also keeps the file smaller, by freeing the space and then
+ * allocating new space, instead of vice versa (in H5MF_realloc).
+ *
+ * QAK - 5/ 8/2006
+ */
+        /* Free previous serialized sections disk space */
+        old_addr = fspace->sect_addr;
+        if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_addr, fspace->alloc_sect_size) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space sections")
+
+        /* Compute new size */
+        new_size = fspace->alloc_sect_size;
+        while(new_size < fspace->sect_size)
+            new_size *= (double)fspace->expand_percent / 100.0;
+        fspace->alloc_sect_size = new_size;
+
+        /* Allocate space for the new serialized sections on disk */
+#ifdef QAK
+HDfprintf(stderr, "%s: Allocating space for larger serialized sections, new_size = %Zu\n", FUNC, new_size);
+#endif /* QAK */
+        if(HADDR_UNDEF == (fspace->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, (hsize_t)fspace->alloc_sect_size)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
+
+        /* Move object in cache, if it actually was relocated */
+        if(H5F_addr_ne(fspace->sect_addr, old_addr)) {
+            if(H5AC_rename(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTRENAME, FAIL, "unable to move free space section info")
+        } /* end if */
+        else {
+            /* Mark free space section as dirty */
+            if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace->sinfo) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space section info as dirty")
+        } /* end else */
+
+        /* Mark free space header as dirty */
+        if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace) < 0)
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+    } /* end if */
+    else {
+        size_t decrease_threshold;      /* Size threshold for decreasing serialized section size */
+        size_t new_size;                /* New size of space for serialized sections */
+        haddr_t old_addr;               /* Old address of serialized sections */
+
+        /* Compute the threshold for decreasing the sections' serialized size */
+        decrease_threshold = ((size_t)fspace->alloc_sect_size * (double)fspace->shrink_percent) / 100.0;
+
+        if(fspace->alloc_sect_size > H5FS_SINFO_SIZE_DEFAULT &&
+                fspace->sect_size < decrease_threshold) {
+/* Currently, the old block data is "thrown away" after the space is reallocated,
+ * so avoid data copy in H5MF_realloc() call by just free'ing the space and
+ * allocating new space.
+ *
+ * This also keeps the file smaller, by freeing the space and then
+ * allocating new space, instead of vice versa (in H5MF_realloc).
+ *
+ * QAK - 5/ 8/2006
+ */
+            /* Free previous serialized sections disk space */
+            old_addr = fspace->sect_addr;
+            if(H5MF_xfree(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, old_addr, fspace->alloc_sect_size) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTFREE, FAIL, "unable to free free space sections")
+
+            /* Compute new size */
+            while(fspace->sect_size < decrease_threshold) {
+                new_size = decrease_threshold;
+
+                decrease_threshold *= (double)fspace->shrink_percent / 100.0;
+            } /* end while */
+            if(new_size < H5FS_SINFO_SIZE_DEFAULT)
+                new_size = H5FS_SINFO_SIZE_DEFAULT;
+            fspace->alloc_sect_size = new_size;
+
+            /* Allocate space for the new serialized sections on disk */
+#ifdef QAK
+HDfprintf(stderr, "%s: Allocating space for smaller serialized sections, new_size = %Zu\n", FUNC, new_size);
+#endif /* QAK */
+            if(HADDR_UNDEF == (fspace->sect_addr = H5MF_alloc(f, H5FD_MEM_FSPACE_SINFO, dxpl_id, (hsize_t)fspace->alloc_sect_size)))
+                HGOTO_ERROR(H5E_FSPACE, H5E_NOSPACE, FAIL, "file allocation failed for free space sections")
+
+            /* Move object in cache, if it actually was relocated */
+            if(H5F_addr_ne(fspace->sect_addr, old_addr)) {
+                if(H5AC_rename(f, H5AC_FSPACE_SINFO, old_addr, fspace->sect_addr) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTRENAME, FAIL, "unable to move free space section info")
+            } /* end if */
+            else {
+                /* Mark free space section as dirty */
+                if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace->sinfo) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space section info as dirty")
+            } /* end else */
+
+            /* Mark free space header as dirty */
+            if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space header as dirty")
+        } /* end if */
+    } /* end else */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_serialize_size() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_iterate_sect_cb
+ *
+ * Purpose:	Skip list iterator callback to iterate over free space sections
+ *              of a particular size
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, May 13, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_iterate_sect_cb(void *_item, void UNUSED *key, void *_udata)
+{
+    H5FS_section_info_t *sect_info = (H5FS_section_info_t *)_item;   /* Free space section to work on */
+    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_sect_cb)
+
+    /* Check arguments. */
+    HDassert(sect_info);
+    HDassert(udata->fspace);
+    HDassert(udata->op);
+
+    /* Make callback for this section */
+    if((*udata->op)(sect_info, udata->op_data) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "iteration callback failed")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_iterate_sect_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_iterate_node_cb
+ *
+ * Purpose:	Skip list iterator callback to iterate over free space sections
+ *              in a bin
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, May 13, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+static herr_t
+H5FS_iterate_node_cb(void *_item, void UNUSED *key, void *_udata)
+{
+    H5FS_node_t *fspace_node = (H5FS_node_t *)_item;   /* Free space size node to work on */
+    H5FS_iter_ud_t *udata = (H5FS_iter_ud_t *)_udata; /* Callback info */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_iterate_node_cb)
+
+    /* Check arguments. */
+    HDassert(fspace_node);
+    HDassert(udata->fspace);
+    HDassert(udata->op);
+
+    /* Iterate through all the sections of this size */
+    HDassert(fspace_node->sect_list);
+    if(H5SL_iterate(fspace_node->sect_list, H5FS_iterate_sect_cb, udata) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section nodes")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_iterate_node_cb() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_iterate
+ *
+ * Purpose:	Iterate over all the sections managed
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Saturday, May 13, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FS_sect_iterate(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace, H5FS_operator_t op, void *op_data)
+{
+    H5FS_iter_ud_t udata;              /* User data for callbacks */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_iterate)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(op);
+
+    /* Check if we need to go get the sections */
+    if(fspace->sinfo == NULL) {
+        if(NULL == (fspace->sinfo = H5FS_sinfo_pin(f, dxpl_id, fspace)))
+            HGOTO_ERROR(H5E_FSPACE, H5E_CANTDECODE, FAIL, "can't pin sections")
+    } /* end if */
+
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->hdr->sect_count = %Hu\n", FUNC, fspace->hdr->sect_count);
+#endif /* QAK */
+
+    /* Set up user data for iterator */
+    udata.fspace = fspace;
+    udata.op = op;
+    udata.op_data = op_data;
+
+    /* Iterate over sections, if there are any */
+    if(fspace->tot_sect_count) {
+        unsigned bin;           /* Current bin we are on */
+
+        /* Iterate over all the bins */
+#ifdef QAK
+HDfprintf(stderr, "%s: Iterate over section bins\n", FUNC);
+#endif /* QAK */
+        for(bin = 0; bin < fspace->sinfo->nbins; bin++) {
+            /* Check if there are any sections in this bin */
+            if(fspace->sinfo->bins[bin].bin_list) {
+                /* Iterate over list of section size nodes for bin */
+                if(H5SL_iterate(fspace->sinfo->bins[bin].bin_list, H5FS_iterate_node_cb, &udata) < 0)
+                    HGOTO_ERROR(H5E_FSPACE, H5E_BADITER, FAIL, "can't iterate over section size nodes")
+            } /* end if */
+        } /* end for */
+    } /* end if */
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_iterate() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_get_sect_count
+ *
+ * Purpose:	Retrieve the number of sections managed
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Tuesday, May 30, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FS_get_sect_count(const H5FS_t *fspace, hsize_t *nsects)
+{
+    FUNC_ENTER_NOAPI_NOFUNC(H5FS_get_sect_count)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(nsects);
+
+    /* Get the section count */
+    *nsects = fspace->tot_sect_count;
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* H5FS_get_sect_count() */
+
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_change_class
+ *
+ * Purpose:	Make appropriate adjustments to internal data structures when
+ *              a section changes class
+ *
+ * Return:	Success:	non-negative
+ *
+ *		Failure:	negative
+ *
+ * Programmer:	Quincey Koziol
+ *              Monday, July 10, 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FS_sect_change_class(H5F_t *f, hid_t dxpl_id, H5FS_t *fspace,
+    H5FS_section_info_t *sect, unsigned new_class)
+{
+    const H5FS_section_class_t *old_cls;        /* Old class of section */
+    const H5FS_section_class_t *new_cls;        /* New class of section */
+    unsigned old_class;                         /* Old class ID of section */
+    herr_t ret_value = SUCCEED;                 /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5FS_sect_change_class)
+
+    /* Check arguments. */
+    HDassert(fspace);
+    HDassert(fspace->sinfo);
+    HDassert(sect);
+    HDassert(sect->type < fspace->nclasses);
+    HDassert(new_class < fspace->nclasses);
+
+    /* Get class info */
+    old_class = sect->type;
+    old_cls = &fspace->sect_cls[sect->type];
+    new_cls = &fspace->sect_cls[new_class];
+#ifdef QAK
+HDfprintf(stderr, "%s: old_cls->flags = %x\n", FUNC, old_cls->flags);
+HDfprintf(stderr, "%s: new_cls->flags = %x\n", FUNC, new_cls->flags);
+#endif /* QAK */
+
+    /* Check if the section's class change will affect the # of serializable or ghost sections */
+    if((old_cls->flags & H5FS_CLS_GHOST_OBJ) != (new_cls->flags & H5FS_CLS_GHOST_OBJ)) {
+        H5FS_node_t *fspace_node;       /* Free list size node */
+        unsigned bin;                   /* Bin to put the free space section in */
+        hbool_t to_ghost;       /* Flag if the section is changing to a ghost section */
+
+        /* Determine if this section is becoming a ghost or is becoming serializable */
+        if(old_cls->flags & H5FS_CLS_GHOST_OBJ)
+            to_ghost = FALSE;
+        else
+            to_ghost = TRUE;
+#ifdef QAK
+HDfprintf(stderr, "%s: to_ghost = %u\n", FUNC, to_ghost);
+#endif /* QAK */
+
+        /* Sanity check */
+        HDassert(fspace->sinfo->bins);
+
+        /* Determine correct bin which holds items of at least the section's size */
+        bin = H5V_log2_gen(sect->size);
+        HDassert(bin < fspace->sinfo->nbins);
+        HDassert(fspace->sinfo->bins[bin].bin_list);
+
+        /* Get space node for section's size */
+        fspace_node = H5SL_search(fspace->sinfo->bins[bin].bin_list, &sect->size);
+        HDassert(fspace_node);
+
+        /* Adjust serializable/ghost counts */
+        if(to_ghost) {
+            /* Adjust global section count totals */
+            fspace->serial_sect_count--;
+            fspace->ghost_sect_count++;
+
+            /* Adjust bin's section count totals */
+            fspace->sinfo->bins[bin].serial_sect_count--;
+            fspace->sinfo->bins[bin].ghost_sect_count++;
+
+            /* Adjust section size node's section count totals */
+            fspace_node->serial_count--;
+            fspace_node->ghost_count++;
+
+            /* Check if we switched a section size node's status */
+            if(fspace_node->serial_count == 0)
+                fspace->sinfo->serial_size_count--;
+            if(fspace_node->ghost_count == 1)
+                fspace->sinfo->ghost_size_count++;
+        } /* end if */
+        else {
+            /* Adjust global section count totals */
+            fspace->serial_sect_count++;
+            fspace->ghost_sect_count--;
+
+            /* Adjust bin's section count totals */
+            fspace->sinfo->bins[bin].serial_sect_count++;
+            fspace->sinfo->bins[bin].ghost_sect_count--;
+
+            /* Adjust section size node's section count totals */
+            fspace_node->serial_count++;
+            fspace_node->ghost_count--;
+
+            /* Check if we switched a section size node's status */
+            if(fspace_node->serial_count == 1)
+                fspace->sinfo->serial_size_count++;
+            if(fspace_node->ghost_count == 0)
+                fspace->sinfo->ghost_size_count--;
+        } /* end else */
+    } /* end if */
+
+    /* Check if the section's class change will affect the mergable list */
+    if((old_cls->flags & H5FS_CLS_SEPAR_OBJ) != (new_cls->flags & H5FS_CLS_SEPAR_OBJ)) {
+        hbool_t to_mergable;       /* Flag if the section is changing to a mergable section */
+
+        /* Determine if this section is becoming mergable or is becoming separate */
+        if(old_cls->flags & H5FS_CLS_SEPAR_OBJ)
+            to_mergable = TRUE;
+        else
+            to_mergable = FALSE;
+#ifdef QAK
+HDfprintf(stderr, "%s: to_mergable = %u\n", FUNC, to_mergable);
+#endif /* QAK */
+
+        /* Add or remove section from merge list, as appropriate */
+        if(to_mergable) {
+#ifdef QAK
+HDfprintf(stderr, "%s: inserting object into merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+#endif /* QAK */
+            if(fspace->sinfo->merge_list == NULL)
+                if(NULL == (fspace->sinfo->merge_list = H5SL_create(H5SL_TYPE_HADDR, 0.5, H5FS_DEFAULT_SKIPLIST_HEIGHT)))
+                    HGOTO_ERROR(H5E_FSPACE, H5E_CANTCREATE, FAIL, "can't create skip list for merging free space sections")
+            if(H5SL_insert(fspace->sinfo->merge_list, sect, &sect->addr) < 0)
+                HGOTO_ERROR(H5E_FSPACE, H5E_CANTINSERT, FAIL, "can't insert free space node into merging skip list")
+        } /* end if */
+        else {
+            H5FS_section_info_t *tmp_sect_node; /* Temporary section node */
+
+#ifdef QAK
+HDfprintf(stderr, "%s: removing object from merge list, sect->type = %u\n", FUNC, (unsigned)sect->type);
+#endif /* QAK */
+            tmp_sect_node = H5SL_remove(fspace->sinfo->merge_list, &sect->addr);
+            if(tmp_sect_node == NULL || tmp_sect_node != sect)
+                HGOTO_ERROR(H5E_FSPACE, H5E_NOTFOUND, FAIL, "can't find section node on size list")
+        } /* end else */
+    } /* end if */
+
+    /* Change the section's class */
+    sect->type = new_class;
+
+    /* Change the serialized size of sections */
+    fspace->sinfo->serial_size -= fspace->sect_cls[old_class].serial_size;
+    fspace->sinfo->serial_size += fspace->sect_cls[new_class].serial_size;
+
+    /* Update current space used for free space sections */
+    if(H5FS_sect_serialize_size(f, dxpl_id, fspace) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTCOMPUTE, FAIL, "can't adjust free space section size on disk")
+    
+    /* Mark free space sections as dirty */
+    if(H5AC_mark_pinned_or_protected_entry_dirty(f, fspace->sinfo) < 0)
+        HGOTO_ERROR(H5E_FSPACE, H5E_CANTMARKDIRTY, FAIL, "unable to mark free space sections as dirty")
+
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
+} /* H5FS_sect_change_class() */
+
+#ifdef H5FS_DEBUG
+
+/*-------------------------------------------------------------------------
+ * Function:	H5FS_sect_assert
+ *
+ * Purpose:	Verify that the sections managed are mostly sane
+ *
+ * Return:	Non-negative on success, negative on failure
+ *
+ * Programmer:	Quincey Koziol
+ *		koziol@hdfgroup.org
+ *		Jul 17 2006
+ *
+ *-------------------------------------------------------------------------
+ */
+herr_t
+H5FS_sect_assert(const H5FS_t *fspace)
+{
+    hsize_t separate_obj;       /* The number of separate objects managed */
+
+    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5FS_sect_assert)
+#ifdef QAK
+HDfprintf(stderr, "%s: fspace->hdr->tot_sect_count = %Hu\n", "H5FS_sect_assert", fspace->hdr->tot_sect_count);
+#endif /* QAK */
+
+    /* Initialize state */
+    separate_obj = 0;
+
+    /* Check for bins to work on */
+    if(fspace->bins) {
+        hsize_t acc_tot_sect_count;     /* Accumulated total section count from bins */
+        hsize_t acc_serial_sect_count;  /* Accumulated serializable section count from bins */
+        hsize_t acc_ghost_sect_count;   /* Accumulated ghost section count from bins */
+        size_t acc_tot_size_count;      /* Accumulated total section size count from bins */
+        size_t acc_serial_size_count;   /* Accumulated serializable section size count from bins */
+        size_t acc_ghost_size_count;    /* Accumulated ghost section size count from bins */
+        unsigned u;             /* Local index variable */
+
+        /* Walk through all sections in bins */
+        acc_tot_sect_count = 0;
+        acc_serial_sect_count = 0;
+        acc_ghost_sect_count = 0;
+        acc_tot_size_count = 0;
+        acc_serial_size_count = 0;
+        acc_ghost_size_count = 0;
+        for(u = 0; u < fspace->nbins; u++) {
+            acc_tot_sect_count += fspace->bins[u].tot_sect_count;
+            acc_serial_sect_count += fspace->bins[u].serial_sect_count;
+            acc_ghost_sect_count += fspace->bins[u].ghost_sect_count;
+            if(fspace->bins[u].bin_list) {
+                H5SL_node_t *curr_size_node;    /* Current section size node in skip list */
+                size_t bin_serial_count;        /* # of serializable sections in this bin */
+                size_t bin_ghost_count;         /* # of ghost sections in this bin */
+
+                acc_tot_size_count += H5SL_count(fspace->bins[u].bin_list);
+
+                /* Walk through the sections in this bin */
+                curr_size_node = H5SL_first(fspace->bins[u].bin_list);
+                bin_serial_count = 0;
+                bin_ghost_count = 0;
+                while(curr_size_node != NULL) {
+                    H5FS_node_t *fspace_node;       /* Section size node */
+                    H5SL_node_t *curr_sect_node;    /* Current section node in skip list */
+                    size_t size_serial_count;       /* # of serializable sections of this size */
+                    size_t size_ghost_count;        /* # of ghost sections of this size */
+
+                    /* Get section size node */
+                    fspace_node = H5SL_item(curr_size_node);
+
+                    /* Check sections on list */
+                    curr_sect_node = H5SL_first(fspace_node->sect_list);
+                    size_serial_count = 0;
+                    size_ghost_count = 0;
+                    while(curr_sect_node != NULL) {
+                        H5FS_section_class_t *cls;      /* Class of section */
+                        H5FS_section_info_t *sect;      /* Section */
+
+                        /* Get section node & it's class */
+                        sect = H5SL_item(curr_sect_node);
+                        cls = &fspace->sect_cls[sect->type];
+#ifdef QAK
+HDfprintf(stderr, "%s: sect->size = %Hu, sect->addr = %a, sect->type = %u\n", "H5FS_assert", sect->size, sect->addr, sect->type);
+#endif /* QAK */
+
+                        /* Sanity check section */
+                        HDassert(H5F_addr_defined(sect->addr));
+                        HDassert(fspace_node->sect_size == sect->size);
+                        if(cls->valid)
+                            (*cls->valid)(cls, sect);
+
+                        /* Add to correct count */
+                        if(cls->flags & H5FS_CLS_GHOST_OBJ)
+                            size_ghost_count++;
+                        else
+                            size_serial_count++;
+
+                        /* Count node, if separate */
+                        if(cls->flags & H5FS_CLS_SEPAR_OBJ)
+                            separate_obj++;
+
+                        /* Get the next section node in the list */
+                        curr_sect_node = H5SL_next(curr_sect_node);
+                    } /* end while */
+
+                    /* Check the number of serializable & ghost sections of this size */
+                    HDassert(fspace_node->serial_count == size_serial_count);
+                    HDassert(fspace_node->ghost_count == size_ghost_count);
+
+                    /* Add to global count of serializable & ghost section sizes */
+                    if(fspace_node->serial_count > 0)
+                        acc_serial_size_count++;
+                    if(fspace_node->ghost_count > 0)
+                        acc_ghost_size_count++;
+
+                    /* Add to bin's serializable & ghost counts */
+                    bin_serial_count += size_serial_count;
+                    bin_ghost_count += size_ghost_count;
+
+                    /* Get the next section size node in the list */
+                    curr_size_node = H5SL_next(curr_size_node);
+                } /* end while */
+
+                /* Check the number of serializable & ghost sections in this bin */
+                HDassert(fspace->bins[u].tot_sect_count == (bin_serial_count + bin_ghost_count));
+                HDassert(fspace->bins[u].serial_sect_count == bin_serial_count);
+                HDassert(fspace->bins[u].ghost_sect_count == bin_ghost_count);
+            } /* end if */
+        } /* end for */
+
+        /* Check counts from bins vs. global counts */
+        HDassert(fspace->tot_size_count == acc_tot_size_count);
+        HDassert(fspace->serial_size_count == acc_serial_size_count);
+        HDassert(fspace->ghost_size_count == acc_ghost_size_count);
+        HDassert(fspace->hdr->tot_sect_count == acc_tot_sect_count);
+        HDassert(fspace->hdr->serial_sect_count == acc_serial_sect_count);
+        HDassert(fspace->hdr->ghost_sect_count == acc_ghost_sect_count);
+    } /* end if */
+    else {
+        /* Check counts are zero */
+        HDassert(fspace->hdr->tot_sect_count == 0);
+        HDassert(fspace->hdr->serial_sect_count == 0);
+        HDassert(fspace->hdr->ghost_sect_count == 0);
+    } /* end else */
+
+    /* Make certain that the number of sections on the address list is correct */
+    if(fspace->merge_list)
+        HDassert(fspace->hdr->tot_sect_count == (separate_obj + H5SL_count(fspace->merge_list)));
+
+    FUNC_LEAVE_NOAPI(SUCCEED)
+} /* end H5FS_sect_assert() */
+#endif /* H5FS_DEBUG */
+
diff --git a/src/H5HFdbg.c b/src/H5HFdbg.c
index 52227a6..1fc6b0f 100644
--- a/src/H5HFdbg.c
+++ b/src/H5HFdbg.c
@@ -435,7 +435,7 @@ H5HF_dblock_debug(H5F_t *f, hid_t dxpl_id, haddr_t addr, FILE *stream,
     HDfprintf(stream, "%*sFree Blocks (offset, size):\n", indent, "");
 
     /* Iterate over the free space sections, to detect overlaps with this block */
-    if(H5FS_iterate(f, dxpl_id, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
+    if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_dblock_debug_cb, &udata) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
 
     /* Close the free space information */
@@ -697,7 +697,7 @@ H5HF_sects_debug(H5F_t *f, hid_t dxpl_id, haddr_t fh_addr,
     udata.fwidth = fwidth;
 
     /* Iterate over all the free space sections */
-    if(H5FS_iterate(f, dxpl_id, hdr->fspace, H5HF_sects_debug_cb, &udata) < 0)
+    if(H5FS_sect_iterate(f, dxpl_id, hdr->fspace, H5HF_sects_debug_cb, &udata) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_BADITER, FAIL, "can't iterate over heap's free space")
 
     /* Close the free space information */
diff --git a/src/H5HFhdr.c b/src/H5HFhdr.c
index 69efdbc..cbaa817 100644
--- a/src/H5HFhdr.c
+++ b/src/H5HFhdr.c
@@ -364,9 +364,6 @@ H5HF_hdr_incr(H5HF_hdr_t *hdr)
     /* Sanity check */
     HDassert(hdr);
 
-/* XXX: When "un-evictable" feature is finished, mark the header as
- *      unevictable on the first block to share it.  - QAK
- */
     /* Mark header as un-evictable when a block is depending on it */
     if(hdr->rc == 0)
         if(H5AC_pin_protected_entry(hdr->f, hdr) < 0)
diff --git a/src/H5HFiblock.c b/src/H5HFiblock.c
index 3970a7e..4872e08 100644
--- a/src/H5HFiblock.c
+++ b/src/H5HFiblock.c
@@ -509,7 +509,7 @@ HDfprintf(stderr, "%s: new_addr = %a\n", FUNC, new_addr);
     /* Move object in cache, if it actually was relocated */
     if(H5F_addr_ne(iblock->addr, new_addr)) {
         if(H5AC_rename(hdr->f, H5AC_FHEAP_IBLOCK, iblock->addr, new_addr) < 0)
-            HGOTO_ERROR(H5E_HEAP, H5E_CANTSPLIT, FAIL, "unable to move fractal heap root indirect block")
+            HGOTO_ERROR(H5E_HEAP, H5E_CANTRENAME, FAIL, "unable to move fractal heap root indirect block")
         iblock->addr = new_addr;
     } /* end if */
 
diff --git a/src/H5HFpkg.h b/src/H5HFpkg.h
index 725e5bb..e684ad1 100644
--- a/src/H5HFpkg.h
+++ b/src/H5HFpkg.h
@@ -530,8 +530,8 @@ H5_DLL herr_t H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id,
     H5HF_free_section_t *node);
 H5_DLL herr_t H5HF_space_close(H5HF_hdr_t *hdr, hid_t dxpl_id);
 H5_DLL herr_t H5HF_space_delete(H5HF_hdr_t *hdr, hid_t dxpl_id);
-H5_DLL herr_t H5HF_space_sect_change_class(H5HF_hdr_t *hdr, H5HF_free_section_t *sect,
-    unsigned new_class);
+H5_DLL herr_t H5HF_space_sect_change_class(H5HF_hdr_t *hdr, hid_t dxpl_id,
+    H5HF_free_section_t *sect, unsigned new_class);
 
 /* Free space section routines */
 H5_DLL H5HF_free_section_t *H5HF_sect_single_new(hsize_t sect_off,
@@ -559,7 +559,6 @@ H5_DLL unsigned H5HF_get_iblock_max_drows_test(const H5HF_t *fh, unsigned pos);
 H5_DLL hsize_t H5HF_get_dblock_size_test(const H5HF_t *fh, unsigned row);
 H5_DLL hsize_t H5HF_get_dblock_free_test(const H5HF_t *fh, unsigned row);
 H5_DLL herr_t H5HF_get_id_off_test(const H5HF_t *fh, const void *id, hsize_t *obj_off);
-H5_DLL herr_t H5HF_debug_test(const H5HF_t *fh);
 #endif /* H5HF_TESTING */
 
 #endif /* _H5HFpkg_H */
diff --git a/src/H5HFsection.c b/src/H5HFsection.c
index fbc514b..ae91be3 100644
--- a/src/H5HFsection.c
+++ b/src/H5HFsection.c
@@ -102,7 +102,8 @@ static herr_t H5HF_sect_single_valid(const H5FS_section_class_t *cls,
 static H5HF_free_section_t *H5HF_sect_row_create(haddr_t sect_off,
     hsize_t sect_size, hbool_t is_first, unsigned row, unsigned col,
     unsigned nentries, H5HF_free_section_t *under_sect);
-static herr_t H5HF_sect_row_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect);
+static herr_t H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id,
+    H5HF_free_section_t *sect);
 static herr_t H5HF_sect_row_from_single(H5HF_hdr_t *hdr,
     H5HF_free_section_t *sect, H5HF_direct_t *dblock);
 static herr_t H5HF_sect_row_free_real(H5HF_free_section_t *sect);
@@ -145,11 +146,12 @@ static herr_t H5HF_sect_indirect_revive_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
     H5HF_free_section_t *sect);
 static herr_t H5HF_sect_indirect_revive(H5HF_hdr_t *hdr, hid_t dxpl_id,
     H5HF_free_section_t *sect, H5HF_indirect_t *sect_iblock);
-static herr_t H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr,
+static herr_t H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id,
     H5HF_free_section_t *row_sect, hbool_t *alloc_from_start);
-static herr_t H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr,
+static herr_t H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id,
     H5HF_free_section_t *sect, unsigned child_entry);
-static herr_t H5HF_sect_indirect_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect);
+static herr_t H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id,
+    H5HF_free_section_t *sect);
 static hbool_t H5HF_sect_indirect_is_first(H5HF_free_section_t *sect);
 static H5HF_indirect_t * H5HF_sect_indirect_get_iblock(H5HF_free_section_t *sect);
 static hsize_t H5HF_sect_indirect_iblock_off(const H5HF_free_section_t *sect);
@@ -333,6 +335,10 @@ H5HF_sect_init_cls(H5FS_section_class_t *cls, H5HF_hdr_t *hdr)
     cls_prvt->hdr = hdr;
     cls->cls_private = cls_prvt;
 
+    /* Increment reference count on heap header */
+    if(H5HF_hdr_incr(hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTINC, FAIL, "can't increment reference count on shared heap header")
+
 done:
     FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_init_cls() */
@@ -354,15 +360,26 @@ done:
 static herr_t
 H5HF_sect_term_cls(H5FS_section_class_t *cls)
 {
-    FUNC_ENTER_NOAPI_NOINIT_NOFUNC(H5HF_sect_term_cls)
+    H5HF_sect_private_t *cls_prvt;      /* Pointer to class private info */
+    herr_t ret_value = SUCCEED;         /* Return value */
+
+    FUNC_ENTER_NOAPI_NOINIT(H5HF_sect_term_cls)
 
     /* Check arguments. */
     HDassert(cls);
 
+    /* Get pointer to class private info */
+    cls_prvt = cls->cls_private;
+
+    /* Decrement reference count on heap header */
+    if(H5HF_hdr_decr(cls_prvt->hdr) < 0)
+        HGOTO_ERROR(H5E_HEAP, H5E_CANTDEC, FAIL, "can't decrement reference count on shared heap header")
+
     /* Free the class private information */
-    cls->cls_private = H5MM_xfree(cls->cls_private);
+    cls->cls_private = H5MM_xfree(cls_prvt);
 
-    FUNC_LEAVE_NOAPI(SUCCEED)
+done:
+    FUNC_LEAVE_NOAPI(ret_value)
 } /* H5HF_sect_term_cls() */
 
 
@@ -1372,7 +1389,7 @@ HDfprintf(stderr, "%s: sect->u.row = {%p, %u, %u, %u, %t}\n", FUNC, sect->u.row.
 
     /* Forward row section to indirect routines, to handle reducing underlying indirect section */
     alloc_from_start = FALSE;
-    if(H5HF_sect_indirect_reduce_row(hdr, sect, &alloc_from_start) < 0)
+    if(H5HF_sect_indirect_reduce_row(hdr, dxpl_id, sect, &alloc_from_start) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce underlying section")
 
     /* Determine entry allocated */
@@ -1427,7 +1444,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_row_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
+H5HF_sect_row_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -1446,7 +1463,7 @@ H5HF_sect_row_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
         sect->sect_info.type = H5HF_FSPACE_SECT_FIRST_ROW;
     else {
         /* Change row section to be the "first row" */
-        if(H5HF_space_sect_change_class(hdr, sect, H5HF_FSPACE_SECT_FIRST_ROW) < 0)
+        if(H5HF_space_sect_change_class(hdr, dxpl_id, sect, H5HF_FSPACE_SECT_FIRST_ROW) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set row section to be first row")
     } /* end else */
 
@@ -2602,6 +2619,7 @@ HDfprintf(stderr, "%s: child_iblock_addr = %a\n", FUNC, child_iblock_addr);
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize indirect section")
 
                 /* If we have a valid child indirect block, release it now */
+                /* (will be pinned, if rows reference it) */
                 if(child_iblock)
                     if(H5AC_unprotect(hdr->f, dxpl_id, H5AC_FHEAP_IBLOCK, child_iblock->addr, child_iblock, H5AC__NO_FLAGS_SET) < 0)
                         HGOTO_ERROR(H5E_HEAP, H5E_CANTUNPROTECT, FAIL, "unable to release fractal heap indirect block")
@@ -2934,7 +2952,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, H5HF_free_section_t *row_sect,
+H5HF_sect_indirect_reduce_row(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *row_sect,
     hbool_t *alloc_from_start)
 {
     H5HF_free_section_t *sect;          /* Indirect section underlying row section */
@@ -3015,14 +3033,14 @@ HDfprintf(stderr, "%s: row_entry = %u\n", FUNC, row_entry);
         is_first = H5HF_sect_indirect_is_first(sect);
 
         /* Remove this indirect section from parent indirect section */
-        if(H5HF_sect_indirect_reduce(hdr, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
+        if(H5HF_sect_indirect_reduce(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce parent indirect section")
         sect->u.indirect.parent = NULL;
         sect->u.indirect.par_entry = 0;
 
         /* If we weren't the first section, set "first row" for this indirect section */
         if(!is_first)
-            if(H5HF_sect_indirect_first(hdr, sect) < 0)
+            if(H5HF_sect_indirect_first(hdr, dxpl_id, sect) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for indirect section")
     } /* end if */
 
@@ -3063,7 +3081,7 @@ HDfprintf(stderr, "%s: sect->u.indirect.dir_nrows = %u\n", FUNC, sect->u.indirec
 
                     /* Make new "first row" in indirect section */
                     if(row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW)
-                        if(H5HF_sect_row_first(hdr, sect->u.indirect.dir_rows[0]) < 0)
+                        if(H5HF_sect_row_first(hdr, dxpl_id, sect->u.indirect.dir_rows[0]) < 0)
                             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for indirect section")
                 } /* end if */
                 else {
@@ -3076,7 +3094,7 @@ HDfprintf(stderr, "%s: sect->u.indirect.dir_nrows = %u\n", FUNC, sect->u.indirec
 
                     /* Make new "first row" in indirect section */
                     if(row_sect->sect_info.type == H5HF_FSPACE_SECT_FIRST_ROW)
-                        if(H5HF_sect_indirect_first(hdr, sect->u.indirect.indir_ents[0]) < 0)
+                        if(H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
                             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for child indirect section")
                 } /* end else */
             } /* end if */
@@ -3233,7 +3251,7 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, H5HF_free_section_t *sect,
+H5HF_sect_indirect_reduce(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect,
     unsigned child_entry)
 {
     unsigned start_entry;               /* Entry for first block covered */
@@ -3281,14 +3299,14 @@ HDfprintf(stderr, "%s: end_entry = %u, end_row = %u, end_col = %u\n", FUNC, end_
             is_first = H5HF_sect_indirect_is_first(sect);
 
             /* Reduce parent indirect section */
-            if(H5HF_sect_indirect_reduce(hdr, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
+            if(H5HF_sect_indirect_reduce(hdr, dxpl_id, sect->u.indirect.parent, sect->u.indirect.par_entry) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTSHRINK, FAIL, "can't reduce parent indirect section")
             sect->u.indirect.parent = NULL;
             sect->u.indirect.par_entry = 0;
 
             /* If we weren't the first section, set "first row" for this indirect section */
             if(!is_first)
-                if(H5HF_sect_indirect_first(hdr, sect) < 0)
+                if(H5HF_sect_indirect_first(hdr, dxpl_id, sect) < 0)
                     HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for indirect section")
         } /* end if */
 
@@ -3323,7 +3341,7 @@ HDfprintf(stderr, "%s: Child is at start of indirect section\n", FUNC);
             HDassert(sect->u.indirect.indir_ents[0]);
 
             /* Make new "first row" in new first indirect child section */
-            if(H5HF_sect_indirect_first(hdr, sect->u.indirect.indir_ents[0]) < 0)
+            if(H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for child indirect section")
         } /* end if */
         else if(child_entry == end_entry) {
@@ -3436,7 +3454,7 @@ HDfprintf(stderr, "%s: sect->u.indirect.indir_nents = %u\n", FUNC, sect->u.indir
                 peer_sect->u.indirect.indir_ents[u]->u.indirect.parent = peer_sect;
 
             /* Make new "first row" in peer section */
-            if(H5HF_sect_indirect_first(hdr, peer_sect->u.indirect.indir_ents[0]) < 0)
+            if(H5HF_sect_indirect_first(hdr, dxpl_id, peer_sect->u.indirect.indir_ents[0]) < 0)
                 HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't make new 'first row' for peer indirect section")
 
             /* Adjust reference counts for current & peer sections */
@@ -3512,7 +3530,7 @@ H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
         ret_value = TRUE;
 
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5HF_sect_indirect_first() */
+} /* end H5HF_sect_indirect_is_first() */
 
 
 /*-------------------------------------------------------------------------
@@ -3529,7 +3547,7 @@ H5HF_sect_indirect_is_first(H5HF_free_section_t *sect)
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5HF_sect_indirect_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
+H5HF_sect_indirect_first(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -3548,7 +3566,7 @@ H5HF_sect_indirect_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
         HDassert(sect->u.indirect.dir_rows[0]);
 
         /* Change first row section in indirect section to be the "first row" */
-        if(H5HF_sect_row_first(hdr, sect->u.indirect.dir_rows[0]) < 0)
+        if(H5HF_sect_row_first(hdr, dxpl_id, sect->u.indirect.dir_rows[0]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set row section to be first row")
     } /* end if */
     else {
@@ -3558,7 +3576,7 @@ H5HF_sect_indirect_first(H5HF_hdr_t *hdr, H5HF_free_section_t *sect)
         HDassert(sect->u.indirect.indir_ents[0]);
 
         /* Forward to first child indirect section */
-        if(H5HF_sect_indirect_first(hdr, sect->u.indirect.indir_ents[0]) < 0)
+        if(H5HF_sect_indirect_first(hdr, dxpl_id, sect->u.indirect.indir_ents[0]) < 0)
             HGOTO_ERROR(H5E_HEAP, H5E_CANTSET, FAIL, "can't set child indirect section to be first row")
     } /* end else */
 
diff --git a/src/H5HFspace.c b/src/H5HFspace.c
index 646f07e..cc9f21b 100644
--- a/src/H5HFspace.c
+++ b/src/H5HFspace.c
@@ -177,7 +177,7 @@ H5HF_space_add(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node,
     udata.dxpl_id = dxpl_id;
 
     /* Add to the free space for the heap */
-    if(H5FS_add(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node, flags, &udata) < 0)
+    if(H5FS_sect_add(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node, flags, &udata) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTINSERT, FAIL, "can't add section to heap free space")
 
 done:
@@ -221,7 +221,7 @@ H5HF_space_find(H5HF_hdr_t *hdr, hid_t dxpl_id, hsize_t request, H5HF_free_secti
             HGOTO_ERROR(H5E_HEAP, H5E_CANTINIT, FAIL, "can't initialize heap free space")
 
     /* Search for free space in the heap */
-    if((node_found = H5FS_find(hdr->f, dxpl_id, hdr->fspace, request, (H5FS_section_info_t **)node)) < 0)
+    if((node_found = H5FS_sect_find(hdr->f, dxpl_id, hdr->fspace, request, (H5FS_section_info_t **)node)) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTALLOC, FAIL, "can't locate free space in fractal heap")
 
     /* Set return value */
@@ -261,7 +261,7 @@ H5HF_space_remove(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *node)
     HDassert(node);
 
     /* Remove from the free space for the heap */
-    if(H5FS_remove(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node) < 0)
+    if(H5FS_sect_remove(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)node) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTREMOVE, FAIL, "can't remove section from heap free space")
 
 done:
@@ -341,7 +341,7 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5HF_space_sect_change_class(H5HF_hdr_t *hdr, H5HF_free_section_t *sect, unsigned new_class)
+H5HF_space_sect_change_class(H5HF_hdr_t *hdr, hid_t dxpl_id, H5HF_free_section_t *sect, unsigned new_class)
 {
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -358,7 +358,7 @@ HDfprintf(stderr, "%s: Called\n", FUNC);
     HDassert(sect);
 
     /* Notify the free space manager that a section has changed class */
-    if(H5FS_sect_change_class(hdr->fspace, (H5FS_section_info_t *)sect, new_class) < 0)
+    if(H5FS_sect_change_class(hdr->f, dxpl_id, hdr->fspace, (H5FS_section_info_t *)sect, new_class) < 0)
         HGOTO_ERROR(H5E_HEAP, H5E_CANTMODIFY, FAIL, "can't modify class of free space section")
 
 done:
diff --git a/src/H5HFtest.c b/src/H5HFtest.c
index d34f1f6..fb25c48 100644
--- a/src/H5HFtest.c
+++ b/src/H5HFtest.c
@@ -327,35 +327,3 @@ H5HF_get_id_off_test(const H5HF_t *fh, const void *_id, hsize_t *obj_off)
     FUNC_LEAVE_NOAPI(SUCCEED)
 } /* H5HF_get_id_off_test() */
 
-
-/*-------------------------------------------------------------------------
- * Function:	H5HF_debug_test
- *
- * Purpose:	Debugging routine for testing
- *
- * Return:	Success:	non-negative
- *
- *		Failure:	negative
- *
- * Programmer:	Quincey Koziol
- *              Tuesday, June 20, 2006
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5HF_debug_test(const H5HF_t *fh)
-{
-    FUNC_ENTER_NOAPI_NOINIT(H5HF_debug_test)
-
-    /* Check arguments. */
-    HDassert(fh);
-    HDassert(fh->hdr);
-
-    HDfprintf(stderr, "%s: fh->hdr->man_iter_off = %Hu\n", FUNC, fh->hdr->man_iter_off);
-    HDfprintf(stderr, "%s: fh->hdr->fspace = %p\n", FUNC, fh->hdr->fspace);
-    if(fh->hdr->fspace)
-        H5FS_debug_test(fh->hdr->fspace);
-
-    FUNC_LEAVE_NOAPI(SUCCEED)
-} /* H5HF_debug_test() */
-
diff --git a/src/Makefile.am b/src/Makefile.am
index 561d63d..55edb50 100755
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -48,7 +48,7 @@ libhdf5_la_SOURCES= H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
         H5Fdbg.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5FD.c H5FDcore.c  \
         H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c   \
         H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c           \
-        H5FDstream.c H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c \
+        H5FDstream.c H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c H5FSsection.c \
         H5G.c H5Gdeprec.c H5Gent.c H5Glink.c H5Gloc.c H5Gname.c H5Gnode.c \
         H5Gobj.c H5Goh.c H5Gstab.c H5Gtest.c H5Gtraverse.c  \
         H5HF.c H5HFcache.c H5HFdbg.c H5HFdblock.c H5HFdtable.c \
diff --git a/src/Makefile.in b/src/Makefile.in
index cb51291..2cb791f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -90,7 +90,7 @@ am_libhdf5_la_OBJECTS = H5.lo H5dbg.lo H5A.lo H5AC.lo H5B.lo \
 	H5Fmount.lo H5Fsfile.lo H5Fsuper.lo H5FD.lo H5FDcore.lo \
 	H5FDfamily.lo H5FDlog.lo H5FDmpi.lo H5FDmpio.lo \
 	H5FDmpiposix.lo H5FDmulti.lo H5FDsec2.lo H5FDstdio.lo \
-	H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo \
+	H5FDstream.lo H5FL.lo H5FO.lo H5FS.lo H5FScache.lo H5FSdbg.lo H5FSsection.lo \
 	H5G.lo H5Gdeprec.lo H5Gent.lo H5Glink.lo H5Gloc.lo H5Gname.lo \
 	H5Gnode.lo H5Gobj.lo H5Goh.lo H5Gstab.lo H5Gtest.lo \
 	H5Gtraverse.lo H5HF.lo H5HFcache.lo H5HFdbg.lo H5HFdblock.lo \
@@ -395,7 +395,7 @@ libhdf5_la_SOURCES = H5.c H5dbg.c H5A.c H5AC.c H5B.c H5Bcache.c \
         H5Fdbg.c H5Fmount.c H5Fsfile.c H5Fsuper.c H5FD.c H5FDcore.c  \
         H5FDfamily.c H5FDlog.c H5FDmpi.c H5FDmpio.c   \
         H5FDmpiposix.c H5FDmulti.c H5FDsec2.c H5FDstdio.c           \
-        H5FDstream.c H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c \
+        H5FDstream.c H5FL.c H5FO.c H5FS.c H5FScache.c H5FSdbg.c H5FSsection.c \
         H5G.c H5Gdeprec.c H5Gent.c H5Glink.c H5Gloc.c H5Gname.c H5Gnode.c \
         H5Gobj.c H5Goh.c H5Gstab.c H5Gtest.c H5Gtraverse.c  \
         H5HF.c H5HFcache.c H5HFdbg.c H5HFdblock.c H5HFdtable.c \
@@ -591,6 +591,7 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FScache.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSdbg.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fdbg.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5FSsection.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fmount.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsfile.Plo@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/H5Fsuper.Plo@am__quote@
diff --git a/tools/misc/h5debug.c b/tools/misc/h5debug.c
index d79089d..5cb47e2 100644
--- a/tools/misc/h5debug.c
+++ b/tools/misc/h5debug.c
@@ -312,9 +312,9 @@ main(int argc, char *argv[])
          * Debug a free space header.
          */
 
-        status = H5FS_hdr_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL);
+        status = H5FS_debug(f, H5P_DATASET_XFER_DEFAULT, addr, stdout, 0, VCOL);
 
-    } else if(!HDmemcmp(sig, H5FS_SECTS_MAGIC, H5FS_SIZEOF_MAGIC)) {
+    } else if(!HDmemcmp(sig, H5FS_SINFO_MAGIC, H5FS_SIZEOF_MAGIC)) {
         /*
          * Debug free space serialized sections.
          */