[svn-r1568] Changes since 19990730

----------------------

This extensive change is the virtual file layer implementation. I've
ported and tested the sec2, family, and core drivers and only ported
the mpio driver (Albert will test it).  So if you need MPIO I would
recommend sticking with the previous version for a while.

You will get a few compile warnings about split and stdio drivers not
being implemented and possibly tracing information not inserted in
some of the drivers. You can safely ignore them but I plan to fix
them.

I'm still working on the split driver because I just realized that it
needs a part of the VFL that isn't written yet.

Documentation is being updated also because there were some minor
changes (mostly just name changes). It should be available on my web
site later this week.

./MANIFEST
./src/Makefile.in
./src/hdf5.h
./src/H5Flow.c			[REMOVED]
./src/H5Fstdio.c		[REMOVED]
./src/H5Fsec2.c			[REMOVED]
./src/H5Fsplit.c		[REMOVED]
./src/H5Fmpio.c			[REMOVED]
./src/H5Ffamily.c		[REMOVED]
./src/H5Fcore.c			[REMOVED]
./src/H5MFpublic.h		[REMOVED]
./src/H5FD.c			[NEW]
./src/H5FDcore.c		[NEW]
./src/H5FDcore.h		[NEW]
./src/H5FDfamily.c		[NEW]
./src/H5FDfamily.h		[NEW]
./src/H5FDmpio.c		[NEW]
./src/H5FDmpio.h		[NEW]
./src/H5FDprivate.h		[NEW]
./src/H5FDpublic.h		[NEW]
./src/H5FDsec2.c		[NEW]
./src/H5FDsec2.h		[NEW]
	Removed/added files for virtual file layer.

./bin/trace
./src/H5.c
	Removed unused public datatypes and added new VFL public
	datatypes.

	Changed an error message.

./config/BlankForm
./config/dec-flags
./config/gnu-flags
./config/hpux10.20
./config/hpux9.03
./config/irix5.x
./config/irix6.x
./config/solaris2.x
./config/unicosmk
	Removed the H5F_OPT_SEEK and H5F_LOW_DFLT constants from the
	configuration since they're no longer applicable. The default
	file driver is always the sec2 driver and it always optimizes
	calls to lseek() or lseek64().

./config/depend.in
	C preprocessor errors generated during automatic dependency
	building are sent to /dev/null to prevent them from appearing
	twice in the make output.

./src/H5AC.c
./src/H5B.c
./src/H5D.c
./src/H5F.c
./src/H5G.c
./src/H5Gent.c
./src/H5Gnode.c
./src/H5HG.c
./src/H5HL.c
./src/H5O.c
./src/H5Oattr.c
./src/H5Odtype.c
./src/H5Oefl.c
./src/H5Oshared.c
./src/H5T.c
./src/H5detect.c
./test/ohdr.c
	Changed H5F_ADDR_UNDEF to HADDR_UNDEF to be more consistent
	with the `haddr_t' datatype which is now a public type.

./src/H5D.c
./src/H5P.c
./src/H5Ppublic.h
./src/H5Tconv.c
./test/cmpd_dset.c
./test/dsets.c
./test/overhead.c
./test/tselect.c
./test/tvltypes.c
	The H5P_DATASET_XFER constant was changed to H5P_DATA_XFER
	because the properties apply to all types of I/O operations,
	not just datasets.

./src/H5B.c
./src/H5Bprivate.h
./src/H5D.c
./src/H5Dpublic.h
./src/H5F.c
./src/H5Farray.c
./src/H5Fistore.c
./src/H5Fprivate.h
./src/H5Fpublic.h
./src/H5Gnode.c
./src/H5Gpkg.h
./src/H5HG.c
./src/H5HL.c
./src/H5O.c
./src/H5R.c
./src/H5Sall.c
./src/H5Shyper.c
./src/H5Smpio.c
./src/H5Spoint.c
./src/H5Sprivate.h
./test/big.c
./test/h5test.c
./test/istore.c
./testpar/t_dset.c
./testpar/t_file.c
./tools/h5debug.c
./tools/h5ls.c
	Modified to work with the virtual file layer by calling H5FD_*
	functions instead of H5F_low_* functions and by passing file
	access and data transfer properties by object ID instead of
	pointer.

	Changed H5D_transfer_t to H5FD_mpio_xfer_t since the
	COLLECTIVE vs. INDEPENDENT transfer mode is specific to the
	MPIO file driver.

	Moved MPIO-specific stuff into the MPIO driver.

./src/H5B.c
./src/H5D.c
./src/H5Fprivate.h
	The H5F_mpio_* private functions were renamed and placed in
	the H5FDmpio driver except those which appeared in H5Smpio.c.

./src/H5E.c
./src/H5Epublic.h
	Added major error number H5E_VFL for virtual file layer
	related errors.

./src/H5F.c
./src/H5Fprivate.h
	Changed the logic that controls whether the boot block is
	written. Instead of assuming that the first call to write the
	boot block is only to allocate space, I've added a function
	argument which makes this explicit.

	Changed the way files are compared so that a driver-defined
	comparison function can be called.  Files which belong to
	different drivers are always considered different.

	Removed H5F_driver_t since file drivers are now identified by
	object ID instead of a special non-user-extendible datatype.

	Removed all the hard-coded low-level file properties which
	have been replaced by the various file drivers.

./src/H5I.c
./src/H5Iprivate.h
	Added the H5I_inc_ref() which was removed a few months ago
	since we finally have a use for it.

./src/H5Ipublic.h
	Added the H5I_VFL object ID type to identify file drivers in
	the virtual file layer.

./src/H5MF.c
./src/H5MFprivate.h
	Moved all the allocation/deallocation code into the virtual
	file layer which allows file drivers to override much of it.

./src/H5P.c
./src/H5Ppublic.h
	Moved file driver-specific code into the various file driver
	files.

	The H5Pcopy() and H5Pclose() functions make calls into the
	virtual file driver to manage the memory for driver-specific
	file access and data transfer properties.

./src/H5private.h
./src/H5public.h
	The `haddr_t' type is now public.

./test/tfile.c
	Added a few more comments.

1 files changed, 68 insertions, 74 deletions

diff --git a/src/H5D.c b/src/H5D.c
index 88bf146..87c684d 100644
--- a/src/H5D.c
+++ b/src/H5D.c
@@ -23,7 +23,6 @@ static char		RcsId[] = "@(#)$Revision$";
 #include <H5Eprivate.h>		/* Error handling		  	*/
 #include <H5Gprivate.h>		/* Group headers		  	*/
 #include <H5HLprivate.h>	/* Name heap				*/
-#include <H5MFprivate.h>	/* File space allocation header		*/
 #include <H5MMprivate.h>	/* Memory management			*/
 #include <H5Oprivate.h>		/* Object headers		  	*/
 #include <H5Pprivate.h>		/* Property lists			*/
@@ -32,6 +31,13 @@ static char		RcsId[] = "@(#)$Revision$";
 #include <H5Vprivate.h>		/* Vector and array functions		*/
 #include <H5Zprivate.h>		/* Data filters				*/
 
+/*
+ * The MPIO driver is needed because there are kludges in this file and
+ * places where we check for things that aren't handled by this driver.
+ */
+#include <H5FDmpio.h>
+
+
 #ifdef HAVE_PARALLEL
 /* Remove this if H5R_DATASET_REGION is no longer used in this file */
 #include <H5Rpublic.h>
@@ -62,7 +68,7 @@ const H5D_create_t	H5D_create_dflt = {
     {NULL, 0, NULL},		/* No fill value			*/
 
     /* External file list */
-    {H5F_ADDR_UNDEF,		/* External file list heap address	*/
+    {HADDR_UNDEF,		/* External file list heap address	*/
      0,				/*...slots allocated			*/
      0,				/*...slots used				*/
      NULL}, 			/*...slot array				*/
@@ -628,7 +634,7 @@ H5Dread(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 			  "selection+offset not within extent");
 	}
     }
-    if (H5P_DEFAULT != plist_id && H5P_DATASET_XFER != H5P_get_class(plist_id)) {
+    if (H5P_DEFAULT != plist_id && H5P_DATA_XFER != H5P_get_class(plist_id)) {
 	HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
     if (!buf) {
@@ -723,7 +729,7 @@ H5Dwrite(hid_t dset_id, hid_t mem_type_id, hid_t mem_space_id,
 			  "selection+offset not within extent");
 	}
     }
-    if (H5P_DEFAULT != plist_id && H5P_DATASET_XFER != H5P_get_class(plist_id)) {
+    if (H5P_DEFAULT != plist_id && H5P_DATA_XFER != H5P_get_class(plist_id)) {
 	HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
     if (!buf) {
@@ -819,7 +825,7 @@ H5D_new(const H5D_create_t *create_parms)
         ret_value->create_parms = H5P_copy (H5P_DATASET_CREATE,
 					    &H5D_create_dflt);
     }
-    ret_value->ent.header = H5F_ADDR_UNDEF;
+    ret_value->ent.header = HADDR_UNDEF;
 
     /* Success */
 
@@ -894,7 +900,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
 
 #ifdef HAVE_PARALLEL
     /* If MPIO is used, no filter support yet. */
-    if (f->shared->access_parms->driver == H5F_LOW_MPIO &&
+    if (H5FD_MPIO==f->shared->fapl->driver_id &&
 	create_parms->pline.nfilters>0) {
 	HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, NULL,
 		     "Parallel IO does not support filters yet");
@@ -1039,7 +1045,7 @@ H5D_create(H5G_entry_t *loc, const char *name, const H5T_t *type,
 			"unable to initialize storage");
 	}
     } else {
-	new_dset->layout.addr = H5F_ADDR_UNDEF;
+	new_dset->layout.addr = HADDR_UNDEF;
     }
 
     /* Update layout message */
@@ -1271,8 +1277,8 @@ H5D_open_oid(H5G_entry_t *ent)
 
 #ifdef HAVE_PARALLEL
     /* If MPIO is used, no filter support yet. */
-    if (dataset->ent.file->shared->access_parms->driver == H5F_LOW_MPIO &&
-            dataset->create_parms->pline.nfilters>0){
+    if (H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id &&
+	dataset->create_parms->pline.nfilters>0){
         HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, NULL,
 		     "Parallel IO does not support filters yet");
     }
@@ -1425,25 +1431,23 @@ H5D_close(H5D_t *dataset)
  *		Thursday, December  4, 1997
  *
  * Modifications:
- *	Robb Matzke, 9 Jun 1998
- *	The data space is no longer cached in the dataset struct.
+ *		Robb Matzke, 1998-06-09
+ *		The data space is no longer cached in the dataset struct.
  *
- * 	Robb Matzke, 11 Aug 1998
- *	Added timing calls around all the data space I/O functions.
+ * 		Robb Matzke, 1998-08-11
+ *		Added timing calls around all the data space I/O functions.
  *
- * 	rky 980918
- *	Added must_convert to do non-optimized read when necessary.
- *
- *  Quincey Koziol, 2 July 1999
- *  Changed xfer_parms parameter to xfer plist parameter, so it could be passed
- *  to H5T_convert
+ * 		rky, 1998-09-18
+ *		Added must_convert to do non-optimized read when necessary.
  *
+ *  		Quincey Koziol, 1999-07-02
+ *		Changed xfer_parms parameter to xfer plist parameter, so it
+ *		could be passed to H5T_convert.
  *-------------------------------------------------------------------------
  */
 herr_t
 H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
-	 const H5S_t *file_space, hid_t dset_xfer_plid,
-	 void *buf/*out*/)
+	 const H5S_t *file_space, hid_t dxpl_id, void *buf/*out*/)
 {
     const H5F_xfer_t	   *xfer_parms = NULL;
     hssize_t    	nelmts;			/*number of elements	*/
@@ -1486,10 +1490,10 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
     HDmemset(&file_iter,0,sizeof(H5S_sel_iter_t));
 
     /* Get the dataset transfer property list */
-    if (H5P_DEFAULT == dset_xfer_plid) {
+    if (H5P_DEFAULT == dxpl_id) {
         xfer_parms = &H5F_xfer_dflt;
-    } else if (H5P_DATASET_XFER != H5P_get_class(dset_xfer_plid) ||
-	       NULL == (xfer_parms = H5I_object(dset_xfer_plid))) {
+    } else if (H5P_DATA_XFER != H5P_get_class(dxpl_id) ||
+	       NULL == (xfer_parms = H5I_object(dxpl_id))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
 
@@ -1504,19 +1508,15 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
     nelmts = H5S_get_select_npoints(mem_space);
 
 #ifdef HAVE_PARALLEL
-    /*
-     * Check if collective data transfer requested.
-     */
-    if (xfer_parms->xfer_mode == H5D_XFER_COLLECTIVE){
-	/*
-	 * Verify that the file can support collective access. The check may
-	 * not be necessarily since collective access can always be simulated
-	 * by independent access.  Nevertheless, must check driver is MPIO
-	 * before using those access_mode which exists only for MPIO case.
-	 */
-	if (dataset->ent.file->shared->access_parms->driver != H5F_LOW_MPIO)
+    {
+	/* Collective access is not permissible with the MPIO driver */
+	H5FD_mpio_dxpl_t *dx;
+	if (H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id &&
+	    (dx=dataset->ent.file->shared->fapl->driver_info) &&
+	    H5FD_MPIO_COLLECTIVE==dx->xfer_mode) {
 	    HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
 			 "collective access not permissible");
+	}
     }
 #endif
 
@@ -1556,7 +1556,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * (the latter in case the arguments to sconv_funcs
      * turn out to be inappropriate for MPI-IO).  */
     if (H5_mpi_opt_types_g &&
-        H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver) {
+        H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id) {
 	sconv->read = H5S_mpio_spaces_read;
     }
 #endif /*HAVE_PARALLEL*/
@@ -1573,7 +1573,7 @@ H5D_read(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 			       &(dataset->create_parms->pline),
 			       &(dataset->create_parms->efl),
 			       H5T_get_size (dataset->type), file_space,
-			       mem_space, xfer_parms, buf/*out*/,
+			       mem_space, dxpl_id, buf/*out*/,
 			       &must_convert);
         if (status<0) {
 	    /* Supports only no conversion, type or space, for now. */
@@ -1697,7 +1697,7 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d, min_e
 			     &(dataset->create_parms->fill),
 			     &(dataset->create_parms->efl), src_type_size,
 			     file_space, &file_iter, smine_nelmts,
-			     xfer_parms, tconv_buf/*out*/);
+			     dxpl_id, tconv_buf/*out*/);
 #ifdef H5S_DEBUG
 	H5_timer_end(&(sconv->stats[1].gath_timer), &timer);
 	sconv->stats[1].gath_nbytes += n * src_type_size;
@@ -1751,7 +1751,7 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d, min_e
          * Perform data type conversion.
          */
 	if (H5T_convert(tpath, src_id, dst_id, smine_nelmts, 0, tconv_buf,
-			bkg_buf, dset_xfer_plid)<0) {
+			bkg_buf, dxpl_id)<0) {
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
                 "data type conversion failed");
         }
@@ -1826,8 +1826,7 @@ printf("%s: check 2.0, src_type_size=%d, dst_type_size=%d, target_size=%d, min_e
  */
 herr_t
 H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
-	  const H5S_t *file_space, hid_t dset_xfer_plid,
-	  const void *buf)
+	  const H5S_t *file_space, hid_t dxpl_id, const void *buf)
 {
     const H5F_xfer_t	   *xfer_parms = NULL;
     hssize_t		nelmts;			/*total number of elmts	*/
@@ -1868,8 +1867,8 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
     /* If MPIO is used, no VL datatype support yet. */
     /* This is because they use the global heap in the file and we don't */
     /* support parallel access of that yet */
-    if (H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver &&
-            H5T_get_class(mem_type)==H5T_VLEN) {
+    if (H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id &&
+	H5T_get_class(mem_type)==H5T_VLEN) {
         HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
 		     "Parallel IO does not support writing VL datatypes yet");
     }
@@ -1878,9 +1877,9 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
     /* If MPIO is used, no dataset region reference support yet. */
     /* This is because they use the global heap in the file and we don't */
     /* support parallel access of that yet */
-    if (H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver &&
-            H5T_get_class(mem_type)==H5T_REFERENCE &&
-            H5T_get_ref_type(mem_type)==H5R_DATASET_REGION) {
+    if (H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id &&
+	H5T_get_class(mem_type)==H5T_REFERENCE &&
+	H5T_get_ref_type(mem_type)==H5R_DATASET_REGION) {
         HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
 		     "Parallel IO does not support writing VL datatypes yet");
     }
@@ -1892,10 +1891,10 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
     HDmemset(&file_iter,0,sizeof(H5S_sel_iter_t));
 
     /* Get the dataset transfer property list */
-    if (H5P_DEFAULT == dset_xfer_plid) {
+    if (H5P_DEFAULT == dxpl_id) {
         xfer_parms = &H5F_xfer_dflt;
-    } else if (H5P_DATASET_XFER != H5P_get_class(dset_xfer_plid) ||
-	       NULL == (xfer_parms = H5I_object(dset_xfer_plid))) {
+    } else if (H5P_DATA_XFER != H5P_get_class(dxpl_id) ||
+	       NULL == (xfer_parms = H5I_object(dxpl_id))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
 
@@ -1915,19 +1914,15 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
     nelmts = H5S_get_select_npoints(mem_space);
 
 #ifdef HAVE_PARALLEL
-    /*
-     * Check if collective data transfer requested.
-     */
-    if (xfer_parms->xfer_mode == H5D_XFER_COLLECTIVE){
-	/*
-	 * Verify that the file can support collective access.  The check may
-	 * not be necessarily since collective access can always be simulated
-	 * by independent access.  Nevertheless, must check driver is MPIO
-	 * before using those access_mode which exists only for MPIO case.
-	 */
-	if (dataset->ent.file->shared->access_parms->driver != H5F_LOW_MPIO)
+    {
+	/* Collective access is not permissible with the MPIO driver */
+	H5FD_mpio_dxpl_t *dx;
+	if (H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id &&
+	    (dx=dataset->ent.file->shared->fapl->driver_info) &&
+	    H5FD_MPIO_COLLECTIVE==dx->xfer_mode) {
 	    HGOTO_ERROR (H5E_DATASET, H5E_UNSUPPORTED, FAIL,
 			 "collective access not permissible");
+	}
     }
 #endif
 
@@ -1974,7 +1969,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
      * (the latter in case the arguments to sconv_funcs
      * turn out to be inappropriate for MPI-IO).  */
     if (H5_mpi_opt_types_g &&
-        H5F_LOW_MPIO==dataset->ent.file->shared->access_parms->driver) {
+        H5FD_MPIO==dataset->ent.file->shared->fapl->driver_id) {
 	sconv->write = H5S_mpio_spaces_write;
     }
 #endif /*HAVE_PARALLEL*/
@@ -1991,8 +1986,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 				&(dataset->create_parms->pline),
 				&(dataset->create_parms->efl),
 				H5T_get_size (dataset->type), file_space,
-				mem_space, xfer_parms, buf,
-				&must_convert/*out*/);
+				mem_space, dxpl_id, buf, &must_convert/*out*/);
         if (status<0) {
 	    /* Supports only no conversion, type or space, for now. */
 	    HGOTO_ERROR(H5E_DATASET, H5E_READERROR, FAIL,
@@ -2145,7 +2139,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 				 &(dataset->create_parms->fill),
 				 &(dataset->create_parms->efl), dst_type_size,
 				 file_space, &bkg_iter, smine_nelmts,
-				 xfer_parms, bkg_buf/*out*/);
+				 dxpl_id, bkg_buf/*out*/);
 #ifdef H5S_DEBUG
 	    H5_timer_end(&(sconv->stats[0].bkg_timer), &timer);
 	    sconv->stats[0].bkg_nbytes += n * dst_type_size;
@@ -2163,7 +2157,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
          * Perform data type conversion.
          */
 	if (H5T_convert(tpath, src_id, dst_id, smine_nelmts, 0, tconv_buf,
-			bkg_buf, dset_xfer_plid)<0) {
+			bkg_buf, dxpl_id)<0) {
             HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
                 "data type conversion failed");
         }
@@ -2182,7 +2176,7 @@ H5D_write(H5D_t *dataset, const H5T_t *mem_type, const H5S_t *mem_space,
 				  &(dataset->create_parms->fill),
 				  &(dataset->create_parms->efl), dst_type_size,
 				  file_space, &file_iter, smine_nelmts,
-				  xfer_parms, tconv_buf);
+				  dxpl_id, tconv_buf);
 #ifdef QAK
 	printf("%s: check 6.35\n",FUNC);
 #endif
@@ -2405,14 +2399,14 @@ H5D_get_file (const H5D_t *dset)
 static herr_t
 H5D_init_storage(H5D_t *dset, const H5S_t *space)
 {
-    intn		ndims;
-    hsize_t		dim[H5O_LAYOUT_NDIMS];
     hssize_t    	npoints, ptsperbuf;
     size_t		size, bufsize=8*1024;
     hid_t		buf_id = -1;
     haddr_t		addr;
     herr_t		ret_value = FAIL;
     void		*buf = NULL;
+    intn		ndims;
+    hsize_t		dim[H5O_LAYOUT_NDIMS];
     
     FUNC_ENTER(H5D_init_storage, FAIL);
     assert(dset);
@@ -2459,7 +2453,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
 		    }
 		} else {
 		    if (H5F_block_write(dset->ent.file, addr, size,
-					&H5F_xfer_dflt, buf)<0) {
+					H5P_DEFAULT, buf)<0) {
 			HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
 				    "unable to write fill value to dataset");
 		    }
@@ -2481,7 +2475,7 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
 	 * If the dataset is accessed via parallel I/O, allocate file space
 	 * for all chunks now and initialize each chunk with the fill value.
 	 */
-	if (H5F_LOW_MPIO==dset->ent.file->shared->access_parms->driver) {
+	if (H5FD_MPIO==dset->ent.file->shared->fapl->driver_id) {
 	    /* We only handle simple data spaces so far */
 	    if ((ndims=H5S_get_simple_extent_dims(space, dim, NULL))<0) {
 		HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
@@ -2490,8 +2484,8 @@ H5D_init_storage(H5D_t *dset, const H5S_t *space)
 	    dim[ndims] = dset->layout.dim[ndims];
 	    ndims++;
 
-	    if (H5F_istore_allocate(dset->ent.file, &(dset->layout),
-				    dim, H5F_xfer_dflt.split_ratios,
+	    if (H5F_istore_allocate(dset->ent.file, H5P_DEFAULT,
+				    &(dset->layout), dim,
 				    &(dset->create_parms->pline),
 				    &(dset->create_parms->fill))<0) {
 		HGOTO_ERROR(H5E_DATASET, H5E_CANTINIT, FAIL,
@@ -2713,14 +2707,14 @@ H5Dvlen_reclaim(hid_t type_id, hid_t space_id, hid_t plist_id, void *buf)
     /* Retrieve dataset transfer property list */
     if (H5P_DEFAULT == plist_id) {
         xfer_parms = &H5F_xfer_dflt;
-    } else if (H5P_DATASET_XFER != H5P_get_class(plist_id) ||
+    } else if (H5P_DATA_XFER != H5P_get_class(plist_id) ||
 	       NULL == (xfer_parms = H5I_object(plist_id))) {
         HRETURN_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not xfer parms");
     }
 
     /* Call H5Diterate with args, etc. */
     ret_value=H5Diterate(buf,type_id,space_id,H5T_vlen_reclaim,
-			 (void*)xfer_parms);
+			 (void*/*FIXME*/)xfer_parms);
 
     FUNC_LEAVE(ret_value);
 }   /* end H5Dvlen_reclaim() */