[svn-r25092] Description:

    More migration to using H5F_io_info_t pointers and away from using
property list IDs internally.  Also, clean up some compiler warnings in the
cache code.

Tested on:
    Mac OSX/64 10.9.2 (amazon) w/C++, FORTRAN & parallel
    (h5committest forthcoming)

1 files changed, 179 insertions, 189 deletions

diff --git a/src/H5Faccum.c b/src/H5Faccum.c
index ce8c426..ba8c4da 100644
--- a/src/H5Faccum.c
+++ b/src/H5Faccum.c
@@ -270,7 +270,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_accum_adjust
+ * Function:	H5F__accum_adjust
  *
  * Purpose:	Adjust accumulator size, if necessary
  *
@@ -283,24 +283,19 @@ done:
  *-------------------------------------------------------------------------
  */
 static herr_t
-H5F_accum_adjust(H5F_meta_accum_t *accum, H5FD_t *lf, hid_t dxpl_id,
+H5F__accum_adjust(H5F_meta_accum_t *accum, const H5F_io_info_t *fio_info,
     H5F_accum_adjust_t adjust, size_t size)
 {
-    H5P_genplist_t *dxpl;               /* DXPL object */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI_NOINIT
+    FUNC_ENTER_STATIC
 
     HDassert(accum);
-    HDassert(lf);
+    HDassert(fio_info);
     HDassert(H5F_ACCUM_APPEND == adjust || H5F_ACCUM_PREPEND == adjust);
     HDassert(size > 0);
     HDassert(size <= H5F_ACCUM_MAX_SIZE);
 
-    /* Get the DXPL plist object for DXPL ID */
-    if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
-
     /* Check if we need more buffer space */
     if((size + accum->size) > accum->alloc_size) {
         size_t new_size;        /* New size of accumulator */
@@ -354,7 +349,7 @@ H5F_accum_adjust(H5F_meta_accum_t *accum, H5FD_t *lf, hid_t dxpl_id,
                     /* Check if the dirty region overlaps the region to eliminate from the accumulator */
                     if((accum->size - shrink_size) < (accum->dirty_off + accum->dirty_len)) {
                         /* Write out the dirty region from the metadata accumulator, with dispatch to driver */
-                        if(H5FD_write(lf, dxpl, H5FD_MEM_DEFAULT, (accum->loc + accum->dirty_off), accum->dirty_len, (accum->buf + accum->dirty_off)) < 0)
+                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, (accum->loc + accum->dirty_off), accum->dirty_len, (accum->buf + accum->dirty_off)) < 0)
                             HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "file write failed")
 
                         /* Reset accumulator dirty flag */
@@ -365,7 +360,7 @@ H5F_accum_adjust(H5F_meta_accum_t *accum, H5FD_t *lf, hid_t dxpl_id,
                     /* Check if the dirty region overlaps the region to eliminate from the accumulator */
                     if(shrink_size > accum->dirty_off) {
                         /* Write out the dirty region from the metadata accumulator, with dispatch to driver */
-                        if(H5FD_write(lf, dxpl, H5FD_MEM_DEFAULT, (accum->loc + accum->dirty_off), accum->dirty_len, (accum->buf + accum->dirty_off)) < 0)
+                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, (accum->loc + accum->dirty_off), accum->dirty_len, (accum->buf + accum->dirty_off)) < 0)
                             HGOTO_ERROR(H5E_FILE, H5E_WRITEERROR, FAIL, "file write failed")
 
                         /* Reset accumulator dirty flag */
@@ -409,11 +404,11 @@ HDmemset(accum->buf + accum->size, 0, (accum->alloc_size - (accum->size + size))
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_accum_adjust() */
+} /* end H5F__accum_adjust() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_accum_write
+ * Function:	H5F__accum_write
  *
  * Purpose:	Attempts to write some data to the metadata accumulator for
  *              a file from a buffer.
@@ -427,368 +422,367 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_accum_write(const H5F_t *f, hid_t dxpl_id, H5FD_mem_t type, haddr_t addr,
+H5F__accum_write(const H5F_io_info_t *fio_info, H5FD_mem_t type, haddr_t addr,
     size_t size, const void *buf)
 {
-    H5P_genplist_t *dxpl;               /* DXPL object */
     H5FD_mem_t  map_type;               /* Mapped memory type */
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(f);
-    HDassert(f->shared);
-    HDassert(H5F_INTENT(f) & H5F_ACC_RDWR);
+    HDassert(fio_info);
+    HDassert(fio_info->f);
+    HDassert(H5F_INTENT(fio_info->f) & H5F_ACC_RDWR);
+    HDassert(fio_info->dxpl);
     HDassert(buf);
 
     /* Treat global heap as raw data */
     map_type = (type == H5FD_MEM_GHEAP) ? H5FD_MEM_DRAW : type;
 
-    /* Get the DXPL plist object for DXPL ID */
-    if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
-
     /* Check for accumulating metadata */
-    if((f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && map_type != H5FD_MEM_DRAW) {
+    if((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && map_type != H5FD_MEM_DRAW) {
+        H5F_meta_accum_t *accum;     /* Alias for file's metadata accumulator */
+
+        /* Set up alias for file's metadata accumulator info */
+        accum = &fio_info->f->shared->accum;
+
         if(size < H5F_ACCUM_MAX_SIZE) {
             /* Sanity check */
-            HDassert(!f->shared->accum.buf || (f->shared->accum.alloc_size >= f->shared->accum.size));
+            HDassert(!accum->buf || (accum->alloc_size >= accum->size));
 
             /* Check if there is already metadata in the accumulator */
-            if(f->shared->accum.size > 0) {
+            if(accum->size > 0) {
                 /* Check if the new metadata adjoins the beginning of the current accumulator */
-                if((addr + size) == f->shared->accum.loc) {
+                if((addr + size) == accum->loc) {
                     /* Check if we need to adjust accumulator size */
-                    if(H5F_accum_adjust(&f->shared->accum, f->shared->lf, dxpl_id, H5F_ACCUM_PREPEND, size) < 0)
+                    if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_PREPEND, size) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                     /* Move the existing metadata to the proper location */
-                    HDmemmove(f->shared->accum.buf + size, f->shared->accum.buf, f->shared->accum.size);
+                    HDmemmove(accum->buf + size, accum->buf, accum->size);
 
                     /* Copy the new metadata at the front */
-                    HDmemcpy(f->shared->accum.buf, buf, size);
+                    HDmemcpy(accum->buf, buf, size);
 
                     /* Set the new size & location of the metadata accumulator */
-                    f->shared->accum.loc = addr;
-                    f->shared->accum.size += size;
+                    accum->loc = addr;
+                    accum->size += size;
 
                     /* Adjust the dirty region and mark accumulator dirty */
-                    if(f->shared->accum.dirty)
-                        f->shared->accum.dirty_len = size + f->shared->accum.dirty_off
-                                + f->shared->accum.dirty_len;
+                    if(accum->dirty)
+                        accum->dirty_len = size + accum->dirty_off + accum->dirty_len;
                     else {
-                        f->shared->accum.dirty_len = size;
-                        f->shared->accum.dirty = TRUE;
+                        accum->dirty_len = size;
+                        accum->dirty = TRUE;
                     } /* end else */
-                    f->shared->accum.dirty_off = 0;
+                    accum->dirty_off = 0;
                 } /* end if */
                 /* Check if the new metadata adjoins the end of the current accumulator */
-                else if(addr == (f->shared->accum.loc + f->shared->accum.size)) {
+                else if(addr == (accum->loc + accum->size)) {
                     /* Check if we need to adjust accumulator size */
-                    if(H5F_accum_adjust(&f->shared->accum, f->shared->lf, dxpl_id, H5F_ACCUM_APPEND, size) < 0)
+                    if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_APPEND, size) < 0)
                         HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                     /* Copy the new metadata to the end */
-                    HDmemcpy(f->shared->accum.buf + f->shared->accum.size, buf, size);
+                    HDmemcpy(accum->buf + accum->size, buf, size);
 
                     /* Adjust the dirty region and mark accumulator dirty */
-                    if(f->shared->accum.dirty)
-                        f->shared->accum.dirty_len = size + (f->shared->accum.size - 
-                                f->shared->accum.dirty_off);
+                    if(accum->dirty)
+                        accum->dirty_len = size + (accum->size - accum->dirty_off);
                     else {
-                        f->shared->accum.dirty_off = f->shared->accum.size;
-                        f->shared->accum.dirty_len = size;
-                        f->shared->accum.dirty = TRUE;
+                        accum->dirty_off = accum->size;
+                        accum->dirty_len = size;
+                        accum->dirty = TRUE;
                     } /* end else */
 
                     /* Set the new size of the metadata accumulator */
-                    f->shared->accum.size += size;
+                    accum->size += size;
                 } /* end if */
                 /* Check if the piece of metadata being written overlaps the metadata accumulator */
-                else if(H5F_addr_overlap(addr, size, f->shared->accum.loc, f->shared->accum.size)) {
+                else if(H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
                     size_t add_size;    /* New size of the accumulator buffer */
 
                     /* Check if the new metadata is entirely within the current accumulator */
-                    if(addr >= f->shared->accum.loc && (addr + size) <= (f->shared->accum.loc + f->shared->accum.size)) {
-                        size_t dirty_off = (size_t)(addr - f->shared->accum.loc);
+                    if(addr >= accum->loc && (addr + size) <= (accum->loc + accum->size)) {
+                        size_t dirty_off = (size_t)(addr - accum->loc);
 
                         /* Copy the new metadata to the proper location within the accumulator */
-                        HDmemcpy(f->shared->accum.buf + dirty_off, buf, size);
+                        HDmemcpy(accum->buf + dirty_off, buf, size);
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        if(f->shared->accum.dirty) {
+                        if(accum->dirty) {
                             /* Check for new metadata starting before current dirty region */
-                            if(dirty_off <= f->shared->accum.dirty_off) {
-                                if((dirty_off + size) <= (f->shared->accum.dirty_off + f->shared->accum.dirty_len))
-                                    f->shared->accum.dirty_len = (f->shared->accum.dirty_off + f->shared->accum.dirty_len) - dirty_off;
+                            if(dirty_off <= accum->dirty_off) {
+                                if((dirty_off + size) <= (accum->dirty_off + accum->dirty_len))
+                                    accum->dirty_len = (accum->dirty_off + accum->dirty_len) - dirty_off;
                                 else
-                                    f->shared->accum.dirty_len = size;
-                                f->shared->accum.dirty_off = dirty_off;
+                                    accum->dirty_len = size;
+                                accum->dirty_off = dirty_off;
                             } /* end if */
                             else {
-                                if((dirty_off + size) <= (f->shared->accum.dirty_off + f->shared->accum.dirty_len))
-                                    ; /* f->shared->accum.dirty_len doesn't change */
+                                if((dirty_off + size) <= (accum->dirty_off + accum->dirty_len))
+                                    ; /* accum->dirty_len doesn't change */
                                 else
-                                    f->shared->accum.dirty_len = (dirty_off + size) - f->shared->accum.dirty_off;
+                                    accum->dirty_len = (dirty_off + size) - accum->dirty_off;
                             } /* end else */
                         } /* end if */
                         else {
-                            f->shared->accum.dirty_off = dirty_off;
-                            f->shared->accum.dirty_len = size;
-                            f->shared->accum.dirty = TRUE;
+                            accum->dirty_off = dirty_off;
+                            accum->dirty_len = size;
+                            accum->dirty = TRUE;
                         } /* end else */
                     } /* end if */
                     /* Check if the new metadata overlaps the beginning of the current accumulator */
-                    else if(addr < f->shared->accum.loc && (addr + size) <= (f->shared->accum.loc + f->shared->accum.size)) {
+                    else if(addr < accum->loc && (addr + size) <= (accum->loc + accum->size)) {
                         size_t old_offset;  /* Offset of old data within the accumulator buffer */
 
                         /* Calculate the amount we will need to add to the accumulator size, based on the amount of overlap */
-                        H5_ASSIGN_OVERFLOW(add_size, (f->shared->accum.loc - addr), hsize_t, size_t);
+                        H5_ASSIGN_OVERFLOW(add_size, (accum->loc - addr), hsize_t, size_t);
 
                         /* Check if we need to adjust accumulator size */
-                        if(H5F_accum_adjust(&f->shared->accum, f->shared->lf, dxpl_id, H5F_ACCUM_PREPEND, add_size) < 0)
+                        if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_PREPEND, add_size) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                         /* Calculate the proper offset of the existing metadata */
-                        H5_ASSIGN_OVERFLOW(old_offset, (addr + size) - f->shared->accum.loc, hsize_t, size_t);
+                        H5_ASSIGN_OVERFLOW(old_offset, (addr + size) - accum->loc, hsize_t, size_t);
 
                         /* Move the existing metadata to the proper location */
-                        HDmemmove(f->shared->accum.buf + size, f->shared->accum.buf + old_offset, (f->shared->accum.size - old_offset));
+                        HDmemmove(accum->buf + size, accum->buf + old_offset, (accum->size - old_offset));
 
                         /* Copy the new metadata at the front */
-                        HDmemcpy(f->shared->accum.buf, buf, size);
+                        HDmemcpy(accum->buf, buf, size);
 
                         /* Set the new size & location of the metadata accumulator */
-                        f->shared->accum.loc = addr;
-                        f->shared->accum.size += add_size;
+                        accum->loc = addr;
+                        accum->size += add_size;
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        if(f->shared->accum.dirty) {
-                            size_t curr_dirty_end = add_size + f->shared->accum.dirty_off + f->shared->accum.dirty_len;
+                        if(accum->dirty) {
+                            size_t curr_dirty_end = add_size + accum->dirty_off + accum->dirty_len;
 
-                            f->shared->accum.dirty_off = 0;
+                            accum->dirty_off = 0;
                             if(size <= curr_dirty_end)
-                                f->shared->accum.dirty_len = curr_dirty_end;
+                                accum->dirty_len = curr_dirty_end;
                             else
-                                f->shared->accum.dirty_len = size;
+                                accum->dirty_len = size;
                         } /* end if */
                         else {
-                            f->shared->accum.dirty_off = 0;
-                            f->shared->accum.dirty_len = size;
-                            f->shared->accum.dirty = TRUE;
+                            accum->dirty_off = 0;
+                            accum->dirty_len = size;
+                            accum->dirty = TRUE;
                         } /* end else */
                     } /* end if */
                     /* Check if the new metadata overlaps the end of the current accumulator */
-                    else if(addr >= f->shared->accum.loc && (addr + size) > (f->shared->accum.loc + f->shared->accum.size)) {
+                    else if(addr >= accum->loc && (addr + size) > (accum->loc + accum->size)) {
                         size_t dirty_off;           /* Offset of dirty region */
 
                         /* Calculate the amount we will need to add to the accumulator size, based on the amount of overlap */
-                        H5_ASSIGN_OVERFLOW(add_size, (addr + size) - (f->shared->accum.loc + f->shared->accum.size), hsize_t, size_t);
+                        H5_ASSIGN_OVERFLOW(add_size, (addr + size) - (accum->loc + accum->size), hsize_t, size_t);
 
                         /* Check if we need to adjust accumulator size */
-                        if(H5F_accum_adjust(&f->shared->accum, f->shared->lf, dxpl_id, H5F_ACCUM_APPEND, add_size) < 0)
+                        if(H5F__accum_adjust(accum, fio_info, H5F_ACCUM_APPEND, add_size) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTRESIZE, FAIL, "can't adjust metadata accumulator")
 
                         /* Compute offset of dirty region (after adjusting accumulator) */
-                        dirty_off = (size_t)(addr - f->shared->accum.loc);
+                        dirty_off = (size_t)(addr - accum->loc);
 
                         /* Copy the new metadata to the end */
-                        HDmemcpy(f->shared->accum.buf + dirty_off, buf, size);
+                        HDmemcpy(accum->buf + dirty_off, buf, size);
 
                         /* Set the new size of the metadata accumulator */
-                        f->shared->accum.size += add_size;
+                        accum->size += add_size;
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        if(f->shared->accum.dirty) {
+                        if(accum->dirty) {
                             /* Check for new metadata starting before current dirty region */
-                            if(dirty_off <= f->shared->accum.dirty_off) {
-                                f->shared->accum.dirty_off = dirty_off;
-                                f->shared->accum.dirty_len = size;
+                            if(dirty_off <= accum->dirty_off) {
+                                accum->dirty_off = dirty_off;
+                                accum->dirty_len = size;
                             } /* end if */
                             else {
-                                f->shared->accum.dirty_len = (dirty_off + size) - f->shared->accum.dirty_off;
+                                accum->dirty_len = (dirty_off + size) - accum->dirty_off;
                             } /* end else */
                         } /* end if */
                         else {
-                            f->shared->accum.dirty_off = dirty_off;
-                            f->shared->accum.dirty_len = size;
-                            f->shared->accum.dirty = TRUE;
+                            accum->dirty_off = dirty_off;
+                            accum->dirty_len = size;
+                            accum->dirty = TRUE;
                         } /* end else */
                     } /* end if */
                     /* New metadata overlaps both ends of the current accumulator */
                     else {
                         /* Check if we need more buffer space */
-                        if(size > f->shared->accum.alloc_size) {
+                        if(size > accum->alloc_size) {
                             size_t new_alloc_size;        /* New size of accumulator */
 
                             /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                             new_alloc_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(size - 1)));
 
                             /* Reallocate the metadata accumulator buffer */
-                            if(NULL == (f->shared->accum.buf = H5FL_BLK_REALLOC(meta_accum, f->shared->accum.buf, new_alloc_size)))
+                            if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_alloc_size)))
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
 
                             /* Note the new buffer size */
-                            f->shared->accum.alloc_size = new_alloc_size;
+                            accum->alloc_size = new_alloc_size;
 #ifdef H5_CLEAR_MEMORY
-HDmemset(f->shared->accum.buf + size, 0, (f->shared->accum.alloc_size - size));
+HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
 #endif /* H5_CLEAR_MEMORY */
                         } /* end if */
 
                         /* Copy the new metadata to the buffer */
-                        HDmemcpy(f->shared->accum.buf, buf, size);
+                        HDmemcpy(accum->buf, buf, size);
 
                         /* Set the new size & location of the metadata accumulator */
-                        f->shared->accum.loc = addr;
-                        f->shared->accum.size = size;
+                        accum->loc = addr;
+                        accum->size = size;
 
                         /* Adjust the dirty region and mark accumulator dirty */
-                        f->shared->accum.dirty_off = 0;
-                        f->shared->accum.dirty_len = size;
-                        f->shared->accum.dirty = TRUE;
+                        accum->dirty_off = 0;
+                        accum->dirty_len = size;
+                        accum->dirty = TRUE;
                     } /* end else */
                 } /* end if */
                 /* New piece of metadata doesn't adjoin or overlap the existing accumulator */
                 else {
                     /* Write out the existing metadata accumulator, with dispatch to driver */
-                    if(f->shared->accum.dirty) {
-                        if(H5FD_write(f->shared->lf, dxpl, H5FD_MEM_DEFAULT, f->shared->accum.loc + f->shared->accum.dirty_off, f->shared->accum.dirty_len, f->shared->accum.buf + f->shared->accum.dirty_off) < 0)
+                    if(accum->dirty) {
+                        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, accum->loc + accum->dirty_off, accum->dirty_len, accum->buf + accum->dirty_off) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
                         /* Reset accumulator dirty flag */
-                        f->shared->accum.dirty = FALSE;
+                        accum->dirty = FALSE;
                     } /* end if */
 
                     /* Cache the new piece of metadata */
                     /* Check if we need to resize the buffer */
-                    if(size > f->shared->accum.alloc_size) {
+                    if(size > accum->alloc_size) {
                         size_t new_size;        /* New size of accumulator */
 
                         /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                         new_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(size - 1)));
 
                         /* Grow the metadata accumulator buffer */
-                        if(NULL == (f->shared->accum.buf = H5FL_BLK_REALLOC(meta_accum, f->shared->accum.buf, new_size)))
+                        if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
                             HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
 
                         /* Note the new buffer size */
-                        f->shared->accum.alloc_size = new_size;
+                        accum->alloc_size = new_size;
 #ifdef H5_CLEAR_MEMORY
 {
-size_t clear_size = MAX(f->shared->accum.size, size);
-HDmemset(f->shared->accum.buf + clear_size, 0, (f->shared->accum.alloc_size - clear_size));
+size_t clear_size = MAX(accum->size, size);
+HDmemset(accum->buf + clear_size, 0, (accum->alloc_size - clear_size));
 }
 #endif /* H5_CLEAR_MEMORY */
                     } /* end if */
                     else {
                         /* Check if we should shrink the accumulator buffer */
-                        if(size < (f->shared->accum.alloc_size / H5F_ACCUM_THROTTLE) &&
-                                f->shared->accum.alloc_size > H5F_ACCUM_THRESHOLD) {
-                            size_t tmp_size = (f->shared->accum.alloc_size / H5F_ACCUM_THROTTLE); /* New size of accumulator buffer */
+                        if(size < (accum->alloc_size / H5F_ACCUM_THROTTLE) &&
+                                accum->alloc_size > H5F_ACCUM_THRESHOLD) {
+                            size_t tmp_size = (accum->alloc_size / H5F_ACCUM_THROTTLE); /* New size of accumulator buffer */
 
                             /* Shrink the accumulator buffer */
-                            if(NULL == (f->shared->accum.buf = H5FL_BLK_REALLOC(meta_accum, f->shared->accum.buf, tmp_size)))
+                            if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, tmp_size)))
                                 HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
 
                             /* Note the new buffer size */
-                            f->shared->accum.alloc_size = tmp_size;
+                            accum->alloc_size = tmp_size;
                         } /* end if */
                     } /* end else */
 
                     /* Update the metadata accumulator information */
-                    f->shared->accum.loc = addr;
-                    f->shared->accum.size = size;
+                    accum->loc = addr;
+                    accum->size = size;
 
                     /* Store the piece of metadata in the accumulator */
-                    HDmemcpy(f->shared->accum.buf, buf, size);
+                    HDmemcpy(accum->buf, buf, size);
 
                     /* Adjust the dirty region and mark accumulator dirty */
-                    f->shared->accum.dirty_off = 0;
-                    f->shared->accum.dirty_len = size;
-                    f->shared->accum.dirty = TRUE;
+                    accum->dirty_off = 0;
+                    accum->dirty_len = size;
+                    accum->dirty = TRUE;
                 } /* end else */
             } /* end if */
             /* No metadata in the accumulator, grab this piece and keep it */
             else {
                 /* Check if we need to reallocate the buffer */
-                if(size > f->shared->accum.alloc_size) {
+                if(size > accum->alloc_size) {
                     size_t new_size;        /* New size of accumulator */
 
                     /* Adjust the buffer size to be a power of 2 that is large enough to hold data */
                     new_size = (size_t)1 << (1 + H5VM_log2_gen((uint64_t)(size - 1)));
 
                     /* Reallocate the metadata accumulator buffer */
-                    if(NULL == (f->shared->accum.buf = H5FL_BLK_REALLOC(meta_accum, f->shared->accum.buf, new_size)))
+                    if(NULL == (accum->buf = H5FL_BLK_REALLOC(meta_accum, accum->buf, new_size)))
                         HGOTO_ERROR(H5E_RESOURCE, H5E_NOSPACE, FAIL, "unable to allocate metadata accumulator buffer")
 
                     /* Note the new buffer size */
-                    f->shared->accum.alloc_size = new_size;
+                    accum->alloc_size = new_size;
 #ifdef H5_CLEAR_MEMORY
-HDmemset(f->shared->accum.buf + size, 0, (f->shared->accum.alloc_size - size));
+HDmemset(accum->buf + size, 0, (accum->alloc_size - size));
 #endif /* H5_CLEAR_MEMORY */
                 } /* end if */
 
                 /* Update the metadata accumulator information */
-                f->shared->accum.loc = addr;
-                f->shared->accum.size = size;
+                accum->loc = addr;
+                accum->size = size;
 
                 /* Store the piece of metadata in the accumulator */
-                HDmemcpy(f->shared->accum.buf, buf, size);
+                HDmemcpy(accum->buf, buf, size);
 
                 /* Adjust the dirty region and mark accumulator dirty */
-                f->shared->accum.dirty_off = 0;
-                f->shared->accum.dirty_len = size;
-                f->shared->accum.dirty = TRUE;
+                accum->dirty_off = 0;
+                accum->dirty_len = size;
+                accum->dirty = TRUE;
             } /* end else */
         } /* end if */
         else {
             /* Write the data */
-            if(H5FD_write(f->shared->lf, dxpl, map_type, addr, size, buf) < 0)
+            if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
                 HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
             /* Check for overlap w/accumulator */
             /* (Note that this could be improved by updating the accumulator
              *  with [some of] the information just read in. -QAK)
              */
-            if(H5F_addr_overlap(addr, size, f->shared->accum.loc, f->shared->accum.size)) {
+            if(H5F_addr_overlap(addr, size, accum->loc, accum->size)) {
                 /* Check for write starting before beginning of accumulator */
-                if(H5F_addr_le(addr, f->shared->accum.loc)) {
+                if(H5F_addr_le(addr, accum->loc)) {
                     /* Check for write ending within accumulator */
-                    if(H5F_addr_le(addr + size, f->shared->accum.loc + f->shared->accum.size)) {
+                    if(H5F_addr_le(addr + size, accum->loc + accum->size)) {
                         size_t overlap_size;    /* Size of overlapping region */
 
                         /* Compute overlap size */
-                        overlap_size = (size_t)((addr + size) - f->shared->accum.loc);
+                        overlap_size = (size_t)((addr + size) - accum->loc);
 
                         /* Check for dirty region */
-                        if(f->shared->accum.dirty) {
-                            haddr_t dirty_start = f->shared->accum.loc + f->shared->accum.dirty_off;    /* File address of start of dirty region */
-                            haddr_t dirty_end = dirty_start + f->shared->accum.dirty_len;               /* File address of end of dirty region */
+                        if(accum->dirty) {
+                            haddr_t dirty_start = accum->loc + accum->dirty_off;    /* File address of start of dirty region */
+                            haddr_t dirty_end = dirty_start + accum->dirty_len;               /* File address of end of dirty region */
 
                             /* Check if entire dirty region is overwritten */
                             if(H5F_addr_le(dirty_end, addr + size)) {
-                                f->shared->accum.dirty = FALSE;
-                                f->shared->accum.dirty_len = 0;
+                                accum->dirty = FALSE;
+                                accum->dirty_len = 0;
                             } /* end if */
                             else {
                                 /* Check for dirty region falling after write */
                                 if(H5F_addr_le(addr + size, dirty_start))
-                                    f->shared->accum.dirty_off = overlap_size;
+                                    accum->dirty_off = overlap_size;
                                 else {    /* Dirty region overlaps w/written region */
-                                    f->shared->accum.dirty_off = 0;
-                                    f->shared->accum.dirty_len -= (size_t)((addr + size) - dirty_start);
+                                    accum->dirty_off = 0;
+                                    accum->dirty_len -= (size_t)((addr + size) - dirty_start);
                                 } /* end else */
                             } /* end if */
                         } /* end if */
 
                         /* Trim bottom of accumulator off */
-                        f->shared->accum.loc += overlap_size;
-                        f->shared->accum.size -= overlap_size;
-                        HDmemmove(f->shared->accum.buf, f->shared->accum.buf + overlap_size, f->shared->accum.size);
+                        accum->loc += overlap_size;
+                        accum->size -= overlap_size;
+                        HDmemmove(accum->buf, accum->buf + overlap_size, accum->size);
                     } /* end if */
                     else {        /* Access covers whole accumulator */
                         /* Reset accumulator, but don't flush */
-                        if(H5F_accum_reset(f, dxpl_id, FALSE) < 0)
+                        if(H5F__accum_reset(fio_info, FALSE) < 0)
                             HGOTO_ERROR(H5E_IO, H5E_CANTRESET, FAIL, "can't reset accumulator")
                     } /* end else */
                 } /* end if */
@@ -796,45 +790,45 @@ HDmemset(f->shared->accum.buf + size, 0, (f->shared->accum.alloc_size - size));
                     size_t overlap_size;    /* Size of overlapping region */
 
                     /* Sanity check */
-                    HDassert(H5F_addr_gt(addr + size, f->shared->accum.loc + f->shared->accum.size));
+                    HDassert(H5F_addr_gt(addr + size, accum->loc + accum->size));
 
                     /* Compute overlap size */
-                    overlap_size = (size_t)((f->shared->accum.loc + f->shared->accum.size) - addr);
+                    overlap_size = (size_t)((accum->loc + accum->size) - addr);
 
                     /* Check for dirty region */
-                    if(f->shared->accum.dirty) {
-                        haddr_t dirty_start = f->shared->accum.loc + f->shared->accum.dirty_off;    /* File address of start of dirty region */
-                        haddr_t dirty_end = dirty_start + f->shared->accum.dirty_len;               /* File address of end of dirty region */
+                    if(accum->dirty) {
+                        haddr_t dirty_start = accum->loc + accum->dirty_off;    /* File address of start of dirty region */
+                        haddr_t dirty_end = dirty_start + accum->dirty_len;               /* File address of end of dirty region */
 
                         /* Check if entire dirty region is overwritten */
                         if(H5F_addr_ge(dirty_start, addr)) {
-                            f->shared->accum.dirty = FALSE;
-                            f->shared->accum.dirty_len = 0;
+                            accum->dirty = FALSE;
+                            accum->dirty_len = 0;
                         } /* end if */
                         else {
                             /* Check for dirty region falling before write */
                             if(H5F_addr_le(dirty_end, addr))
                                 ; /* noop */
                             else    /* Dirty region overlaps w/written region */
-                                f->shared->accum.dirty_len = (size_t)(addr - dirty_start);
+                                accum->dirty_len = (size_t)(addr - dirty_start);
                         } /* end if */
                     } /* end if */
 
                     /* Trim top of accumulator off */
-                    f->shared->accum.size -= overlap_size;
+                    accum->size -= overlap_size;
                 } /* end else */
             } /* end if */
         } /* end else */
     } /* end if */
     else {
         /* Write the data */
-        if(H5FD_write(f->shared->lf, dxpl, map_type, addr, size, buf) < 0)
+        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, map_type, addr, size, buf) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
     } /* end else */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_accum_write() */
+} /* end H5F__accum_write() */
 
 
 /*-------------------------------------------------------------------------
@@ -1002,7 +996,7 @@ done:
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_accum_flush
+ * Function:	H5F__accum_flush
  *
  * Purpose:	Flush the metadata accumulator to the file
  *
@@ -1015,38 +1009,33 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_accum_flush(const H5F_t *f, hid_t dxpl_id)
+H5F__accum_flush(const H5F_io_info_t *fio_info)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
 
     FUNC_ENTER_NOAPI(FAIL)
 
-    HDassert(f);
-    HDassert(f->shared);
+    HDassert(fio_info);
+    HDassert(fio_info->f);
+    HDassert(fio_info->dxpl);
 
     /* Check if we need to flush out the metadata accumulator */
-    if((f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && f->shared->accum.dirty) {
-        H5P_genplist_t *dxpl;               /* DXPL object */
-
-        /* Get the DXPL plist object for DXPL ID */
-        if(NULL == (dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
-
+    if((fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) && fio_info->f->shared->accum.dirty) {
         /* Flush the metadata contents */
-        if(H5FD_write(f->shared->lf, dxpl, H5FD_MEM_DEFAULT, f->shared->accum.loc + f->shared->accum.dirty_off, f->shared->accum.dirty_len, f->shared->accum.buf + f->shared->accum.dirty_off) < 0)
+        if(H5FD_write(fio_info->f->shared->lf, fio_info->dxpl, H5FD_MEM_DEFAULT, fio_info->f->shared->accum.loc + fio_info->f->shared->accum.dirty_off, fio_info->f->shared->accum.dirty_len, fio_info->f->shared->accum.buf + fio_info->f->shared->accum.dirty_off) < 0)
             HGOTO_ERROR(H5E_IO, H5E_WRITEERROR, FAIL, "file write failed")
 
         /* Reset the dirty flag */
-        f->shared->accum.dirty = FALSE;
+        fio_info->f->shared->accum.dirty = FALSE;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_accum_flush() */
+} /* end H5F__accum_flush() */
 
 
 /*-------------------------------------------------------------------------
- * Function:	H5F_accum_reset
+ * Function:	H5F__accum_reset
  *
  * Purpose:	Reset the metadata accumulator for the file
  *
@@ -1059,37 +1048,38 @@ done:
  *-------------------------------------------------------------------------
  */
 herr_t
-H5F_accum_reset(const H5F_t *f, hid_t dxpl_id, hbool_t flush)
+H5F__accum_reset(const H5F_io_info_t *fio_info, hbool_t flush)
 {
     herr_t      ret_value = SUCCEED;    /* Return value */
 
-    FUNC_ENTER_NOAPI(FAIL)
+    FUNC_ENTER_PACKAGE
 
-    HDassert(f);
-    HDassert(f->shared);
+    HDassert(fio_info);
+    HDassert(fio_info->f);
+    HDassert(fio_info->dxpl);
 
     /* Flush any dirty data in accumulator, if requested */
     if(flush)
-        if(H5F_accum_flush(f, dxpl_id) < 0)
+        if(H5F__accum_flush(fio_info) < 0)
             HGOTO_ERROR(H5E_FILE, H5E_CANTFLUSH, FAIL, "can't flush metadata accumulator")
 
     /* Check if we need to reset the metadata accumulator information */
-    if(f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) {
+    if(fio_info->f->shared->feature_flags & H5FD_FEAT_ACCUMULATE_METADATA) {
         /* Sanity check */
-        HDassert(!f->closing || FALSE == f->shared->accum.dirty);
+        HDassert(!fio_info->f->closing || FALSE == fio_info->f->shared->accum.dirty);
 
         /* Free the buffer */
-        if(f->shared->accum.buf)
-            f->shared->accum.buf = H5FL_BLK_FREE(meta_accum, f->shared->accum.buf);
+        if(fio_info->f->shared->accum.buf)
+            fio_info->f->shared->accum.buf = H5FL_BLK_FREE(meta_accum, fio_info->f->shared->accum.buf);
 
         /* Reset the buffer sizes & location */
-        f->shared->accum.alloc_size = f->shared->accum.size = 0;
-        f->shared->accum.loc = HADDR_UNDEF;
-        f->shared->accum.dirty = FALSE;
-        f->shared->accum.dirty_len = 0;
+        fio_info->f->shared->accum.alloc_size = fio_info->f->shared->accum.size = 0;
+        fio_info->f->shared->accum.loc = HADDR_UNDEF;
+        fio_info->f->shared->accum.dirty = FALSE;
+        fio_info->f->shared->accum.dirty_len = 0;
     } /* end if */
 
 done:
     FUNC_LEAVE_NOAPI(ret_value)
-} /* end H5F_accum_reset() */
+} /* end H5F__accum_reset() */