summaryrefslogtreecommitdiffstats
path: root/src/H5MF.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2017-03-13 15:21:28 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2017-03-13 15:21:28 (GMT)
commit4fad103187db9095afc8eab90b5f5544feb1d19b (patch)
tree3e74669322711c4ea14f8fd80ecf14da984c6212 /src/H5MF.c
parent0b78740ff471ff6fe68ceae65e3df76fef886ec4 (diff)
downloadhdf5-4fad103187db9095afc8eab90b5f5544feb1d19b.zip
hdf5-4fad103187db9095afc8eab90b5f5544feb1d19b.tar.gz
hdf5-4fad103187db9095afc8eab90b5f5544feb1d19b.tar.bz2
Bring changes to I/O parameters from page_buffering branch.
Diffstat (limited to 'src/H5MF.c')
-rw-r--r--src/H5MF.c16
1 files changed, 13 insertions, 3 deletions
diff --git a/src/H5MF.c b/src/H5MF.c
index 23f128f..36b9386 100644
--- a/src/H5MF.c
+++ b/src/H5MF.c
@@ -645,7 +645,7 @@ herr_t
H5MF_xfree(H5F_t *f, H5FD_mem_t alloc_type, hid_t dxpl_id, haddr_t addr,
hsize_t size)
{
- H5F_io_info_t fio_info; /* I/O info for operation */
+ H5F_io_info2_t fio_info; /* I/O info for operation */
H5MF_free_section_t *node = NULL; /* Free space section pointer */
H5MF_sect_ud_t udata; /* User data for callback */
H5P_genplist_t *dxpl = NULL; /* DXPL for setting ring */
@@ -688,8 +688,18 @@ HDfprintf(stderr, "%s: fs_type = %u\n", FUNC, (unsigned)fs_type);
/* Set up I/O info for operation */
fio_info.f = f;
- if(NULL == (fio_info.dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
- HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
+ if(H5FD_MEM_DRAW == alloc_type) {
+ if(NULL == (fio_info.meta_dxpl = (H5P_genplist_t *)H5I_object(H5AC_ind_read_dxpl_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
+ if(NULL == (fio_info.raw_dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
+ } /* end if */
+ else {
+ if(NULL == (fio_info.meta_dxpl = (H5P_genplist_t *)H5I_object(dxpl_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
+ if(NULL == (fio_info.raw_dxpl = (H5P_genplist_t *)H5I_object(H5AC_rawdata_dxpl_id)))
+ HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "can't get property list")
+ } /* end else */
/* Check if the space to free intersects with the file's metadata accumulator */
if(H5F__accum_free(&fio_info, alloc_type, addr, size) < 0)