[svn-r25575] cleanup H5I usage in VOL by removing the use of the aux pointer and

make a higher level wrapper object around all VOL objects that
includes the VOL information.

1 files changed, 73 insertions, 249 deletions

diff --git a/src/H5Gdeprec.c b/src/H5Gdeprec.c
index 22e09ed..c580f73 100644
--- a/src/H5Gdeprec.c
+++ b/src/H5Gdeprec.c
@@ -221,14 +221,13 @@ H5G_map_obj_type(H5O_type_t obj_type)
 hid_t
 H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
 {
-    void    *grp = NULL;       /* dset token from VOL plugin */
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin;        /* VOL plugin information */
+    void *grp = NULL;                   /* group token from VOL plugin */
+    H5VL_object_t *obj = NULL;          /* object token of loc_id */
     H5VL_loc_params_t loc_params;
-    hid_t           tmp_gcpl = (-1);    /* Temporary group creation property list */
-    hid_t           lcpl_id = H5P_LINK_CREATE_DEFAULT;
-    H5P_genplist_t  *plist;
-    hid_t	    ret_value;          /* Return value */
+    H5P_genplist_t *plist;              /* Property list pointer */
+    hid_t tmp_gcpl = (-1);              /* Temporary group creation property list */
+    hid_t lcpl_id = H5P_LINK_CREATE_DEFAULT;
+    hid_t ret_value;                    /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE3("i", "i*sz", loc_id, name, size_hint);
@@ -277,21 +276,17 @@ H5Gcreate1(hid_t loc_id, const char *name, size_t size_hint)
     loc_params.type = H5VL_OBJECT_BY_SELF;
     loc_params.obj_type = H5I_get_type(loc_id);
 
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+    /* get the location object */
+    if(NULL == (obj = (H5VL_object_t *)H5I_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Create the group through the VOL */
-    if(NULL == (grp = H5VL_group_create(obj, loc_params, vol_plugin->cls, name, tmp_gcpl, 
+    if(NULL == (grp = H5VL_group_create(obj->vol_obj, loc_params, obj->vol_info->vol_cls, name, tmp_gcpl, 
                                         H5P_GROUP_ACCESS_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
 
-    /* Get an atom for the group with the VOL information as the auxilary struct*/
-    if((ret_value = H5VL_register_id(H5I_GROUP, grp, vol_plugin, TRUE)) < 0)
+    /* Get an atom for the group */
+    if((ret_value = H5VL_register_id(H5I_GROUP, grp, obj->vol_info, TRUE)) < 0)
 	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize group handle")
 
 done:
@@ -299,7 +294,7 @@ done:
         if(H5I_dec_ref(tmp_gcpl) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release property list")
     if (ret_value < 0 && grp)
-        if(H5VL_group_close (grp, vol_plugin->cls, H5AC_dxpl_id, H5_REQUEST_NULL) < 0)
+        if(H5VL_group_close (grp, obj->vol_info->vol_cls, H5AC_dxpl_id, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
 
     FUNC_LEAVE_API(ret_value)
@@ -326,11 +321,10 @@ done:
 hid_t
 H5Gopen1(hid_t loc_id, const char *name)
 {
-    void    *grp = NULL;       /* dset token from VOL plugin */
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin;        /* VOL plugin information */
+    void *grp = NULL;                   /* group token from VOL plugin */
+    H5VL_object_t *obj = NULL;          /* object token of loc_id */
     H5VL_loc_params_t loc_params;
-    hid_t       ret_value;              /* Return value */
+    hid_t ret_value;                    /* Return value */
 
     FUNC_ENTER_API(FAIL)
     H5TRACE2("i", "i*s", loc_id, name);
@@ -342,26 +336,22 @@ H5Gopen1(hid_t loc_id, const char *name)
     loc_params.type = H5VL_OBJECT_BY_SELF;
     loc_params.obj_type = H5I_get_type(loc_id);
 
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+    /* get the location object */
+    if(NULL == (obj = (H5VL_object_t *)H5I_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Create the group through the VOL */
-    if(NULL == (grp = H5VL_group_open(obj, loc_params, vol_plugin->cls, name, H5P_DEFAULT, 
+    if(NULL == (grp = H5VL_group_open(obj->vol_obj, loc_params, obj->vol_info->vol_cls, name, H5P_DEFAULT, 
                                       H5AC_dxpl_id, H5_REQUEST_NULL)))
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create group")
 
-    /* Get an atom for the group with the VOL information as the auxilary struct*/
-    if((ret_value = H5VL_register_id(H5I_GROUP, grp, vol_plugin, TRUE)) < 0)
+    /* Get an atom for the group */
+    if((ret_value = H5VL_register_id(H5I_GROUP, grp, obj->vol_info, TRUE)) < 0)
 	HGOTO_ERROR(H5E_ATOM, H5E_CANTREGISTER, FAIL, "unable to atomize group handle")
 
 done:
     if (ret_value < 0 && grp)
-        if(H5VL_group_close (grp, vol_plugin->cls, H5AC_dxpl_id, H5_REQUEST_NULL) < 0)
+        if(H5VL_group_close (grp, obj->vol_info->vol_cls, H5AC_dxpl_id, H5_REQUEST_NULL) < 0)
             HDONE_ERROR(H5E_SYM, H5E_CLOSEERROR, FAIL, "unable to release group")
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gopen1() */
@@ -396,8 +386,7 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     if(type == H5L_TYPE_HARD) {
-        void    *obj = NULL;        /* object token of loc_id */
-        H5VL_t  *vol_plugin = NULL; /* VOL plugin information */
+        H5VL_object_t    *obj = NULL;        /* object token of loc_id */
         H5VL_loc_params_t loc_params1;
         H5VL_loc_params_t loc_params2;
 
@@ -410,27 +399,23 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
         loc_params2.loc_data.loc_by_name.name = new_name;
         loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
-        /* get the file object */
-        if(NULL == (obj = (void *)H5I_object(cur_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(cur_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+        /* get the location object */
+        if(NULL == (obj = (H5VL_object_t *)H5I_object(cur_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
         /* set creation properties */
-        if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj) < 0)
+        if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj->vol_obj) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target")
         if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target loc params")
 
         /* Create the link through the VOL */
-        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_HARD, NULL, loc_params2, vol_plugin->cls,
+        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_HARD, NULL, loc_params2, obj->vol_info->vol_cls,
                                          lcpl_id, H5P_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end if */
     else if(type == H5L_TYPE_SOFT) {
-        void    *obj = NULL;        /* object token of loc_id */
-        H5VL_t  *vol_plugin = NULL; /* VOL plugin information */
+        H5VL_object_t    *obj = NULL;        /* object token of loc_id */
         H5VL_loc_params_t loc_params;
 
         loc_params.type = H5VL_OBJECT_BY_NAME;
@@ -438,19 +423,16 @@ H5Glink(hid_t cur_loc_id, H5G_link_t type, const char *cur_name, const char *new
         loc_params.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
         loc_params.obj_type = H5I_get_type(cur_loc_id);
 
-        /* get the file object */
-        if(NULL == (obj = (void *)H5I_object(cur_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(cur_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+        /* get the location object */
+        if(NULL == (obj = (H5VL_object_t *)H5I_object(cur_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
         /* set creation properties */
         if(H5P_set(plist, H5VL_PROP_LINK_TARGET_NAME, &cur_name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name")
 
         /* Create the link through the VOL */
-        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_SOFT, obj, loc_params, vol_plugin->cls, 
+        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_SOFT, obj->vol_obj, loc_params, obj->vol_info->vol_cls, 
                                          lcpl_id, H5P_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
@@ -492,10 +474,8 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
         HGOTO_ERROR(H5E_ATOM, H5E_BADATOM, FAIL, "can't find object for ID")
 
     if(type == H5L_TYPE_HARD) {
-        void    *obj1 = NULL;        /* object token of loc_id */
-        void    *obj2 = NULL;        /* object token of loc_id */
-        H5VL_t  *vol_plugin1 = NULL; /* VOL plugin information */
-        H5VL_t  *vol_plugin2 = NULL; /* VOL plugin information */
+        H5VL_object_t    *obj1 = NULL;        /* object token of loc_id */
+        H5VL_object_t    *obj2 = NULL;        /* object token of loc_id */
         H5VL_loc_params_t loc_params1;
         H5VL_loc_params_t loc_params2;
 
@@ -509,35 +489,25 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
         loc_params2.loc_data.loc_by_name.name = new_name;
         loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
-        /* get the file object */
-        if(NULL == (obj1 = (void *)H5I_object(cur_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin1 = (H5VL_t *)H5I_get_aux(cur_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
-
-        /* get the file object */
-        if(NULL == (obj2 = (void *)H5I_object(new_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin2 = (H5VL_t *)H5I_get_aux(new_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+        /* get the location object */
+        if(NULL == (obj1 = (H5VL_object_t *)H5I_object(cur_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
+        if(NULL == (obj2 = (H5VL_object_t *)H5I_object(new_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
         /* set creation properties */
-        if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj1) < 0)
+        if(H5P_set(plist, H5VL_PROP_LINK_TARGET, &obj1->vol_obj) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target id")
         if(H5P_set(plist, H5VL_PROP_LINK_TARGET_LOC_PARAMS, &loc_params1) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't set property value for target name")
 
         /* Create the link through the VOL */
-        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_HARD, obj2, loc_params2, 
-                                         (vol_plugin1!=NULL ? vol_plugin1->cls : vol_plugin2->cls),
+        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_HARD, obj2->vol_obj, loc_params2, obj2->vol_info->vol_cls,
                                          lcpl_id, H5P_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end if */
     else if(type == H5L_TYPE_SOFT) {
-        void    *obj = NULL;        /* object token of loc_id */
-        H5VL_t  *vol_plugin;        /* VOL plugin information */
+        H5VL_object_t    *obj = NULL;        /* object token of loc_id */
         H5VL_loc_params_t loc_params;
 
         /* Soft links only need one location, the new_loc_id, but it's possible that
@@ -550,19 +520,16 @@ H5Glink2(hid_t cur_loc_id, const char *cur_name, H5G_link_t type,
         loc_params.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
         loc_params.obj_type = H5I_get_type(new_loc_id);
 
-        /* get the file object */
-        if(NULL == (obj = (void *)H5I_object(new_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(new_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+        /* get the location object */
+        if(NULL == (obj = (H5VL_object_t *)H5I_object(new_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
         /* set creation properties */
         if(H5P_set(plist, H5VL_PROP_LINK_TARGET_NAME, &cur_name) < 0)
             HGOTO_ERROR(H5E_PLIST, H5E_CANTGET, FAIL, "can't get property value for target name")
 
         /* Create the link through the VOL */
-        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_SOFT, obj, loc_params, vol_plugin->cls, 
+        if((ret_value = H5VL_link_create(H5VL_LINK_CREATE_SOFT, obj->vol_obj, loc_params, obj->vol_info->vol_cls,
                                          lcpl_id, H5P_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
             HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link")
     } /* end else if */
@@ -584,8 +551,7 @@ done:
 herr_t
 H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
 {
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin = NULL; /* VOL plugin information */
+    H5VL_object_t    *obj = NULL;        /* object token of loc_id */
     H5VL_loc_params_t loc_params1;
     H5VL_loc_params_t loc_params2;
     herr_t      ret_value = SUCCEED;       /* Return value */
@@ -602,15 +568,12 @@ H5Gmove(hid_t src_loc_id, const char *src_name, const char *dst_name)
     loc_params2.loc_data.loc_by_name.name = dst_name;
     loc_params2.loc_data.loc_by_name.lapl_id = H5P_DEFAULT;
 
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(src_loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(src_loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+    /* get the location object */
+    if(NULL == (obj = (H5VL_object_t *)H5I_object(src_loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Create the link through the VOL */
-    if((ret_value = H5VL_link_move(obj, loc_params1, NULL, loc_params2, vol_plugin->cls,
+    if((ret_value = H5VL_link_move(obj->vol_obj, loc_params1, NULL, loc_params2, obj->vol_info->vol_cls,
                                    H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link")
 
@@ -630,11 +593,9 @@ herr_t
 H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     const char *dst_name)
 {
-    void    *obj1 = NULL;        /* object token of src_id */
-    H5VL_t  *vol_plugin1;        /* VOL plugin information */
+    H5VL_object_t    *obj1 = NULL;        /* object token of src_id */
     H5VL_loc_params_t loc_params1;
-    void    *obj2 = NULL;        /* object token of dst_id */
-    H5VL_t  *vol_plugin2;        /* VOL plugin information */
+    H5VL_object_t    *obj2 = NULL;        /* object token of dst_id */
     H5VL_loc_params_t loc_params2;
     herr_t      ret_value = SUCCEED;       /* Return value */
 
@@ -653,30 +614,19 @@ H5Gmove2(hid_t src_loc_id, const char *src_name, hid_t dst_loc_id,
     loc_params2.obj_type = H5I_get_type(dst_loc_id);
 
     if(H5L_SAME_LOC != src_loc_id) {
-        /* get the file object */
-        if(NULL == (obj1 = (void *)H5I_object(src_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin1 = (H5VL_t *)H5I_get_aux(src_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+        /* get the location object */
+        if(NULL == (obj1 = (H5VL_object_t *)H5I_object(src_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
     }
     if(H5L_SAME_LOC != dst_loc_id) {
-        /* get the file object */
-        if(NULL == (obj2 = (void *)H5I_object(dst_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-        /* get the plugin pointer */
-        if (NULL == (vol_plugin2 = (H5VL_t *)H5I_get_aux(dst_loc_id)))
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
-    }
-    /* Make sure that the VOL plugins are the same */
-    if(H5L_SAME_LOC != dst_loc_id && H5L_SAME_LOC != src_loc_id) {
-        if (vol_plugin1 != vol_plugin2)
-            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "Objects are accessed through different VOL plugins and can't be linked")
+        /* get the location object */
+        if(NULL == (obj2 = (H5VL_object_t *)H5I_object(dst_loc_id)))
+            HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
     }
 
     /* Move the link through the VOL */
-    if((ret_value = H5VL_link_move(obj1, loc_params1, obj2, loc_params2, 
-                                   (vol_plugin1!=NULL ? vol_plugin1->cls : vol_plugin2->cls), 
+    if((ret_value = H5VL_link_move(obj1->vol_obj, loc_params1, obj2->vol_obj, loc_params2, 
+                                   obj1->vol_info->vol_cls,
                                    H5P_DEFAULT, H5P_DEFAULT, H5AC_dxpl_id, H5_REQUEST_NULL)) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to create link")
 
@@ -695,8 +645,7 @@ done:
 herr_t
 H5Gunlink(hid_t loc_id, const char *name)
 {
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin;        /* VOL plugin information */
+    H5VL_object_t    *obj = NULL;        /* object token of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -711,15 +660,12 @@ H5Gunlink(hid_t loc_id, const char *name)
     loc_params.loc_data.loc_by_name.name = name;
     loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
 
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+    /* get the location object */
+    if(NULL == (obj = (H5VL_object_t *)H5I_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Delete the link through the VOL */
-    if(H5VL_link_specific(obj, loc_params, vol_plugin->cls, H5VL_LINK_DELETE, 
+    if(H5VL_link_specific(obj->vol_obj, loc_params, obj->vol_info->vol_cls, H5VL_LINK_DELETE, 
                           H5AC_dxpl_id, H5_REQUEST_NULL) < 0)
 	HGOTO_ERROR(H5E_SYM, H5E_CANTDELETE, FAIL, "unable to delete link")
 
@@ -739,8 +685,7 @@ done:
 herr_t
 H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
 {
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin;        /* VOL plugin information */
+    H5VL_object_t    *obj = NULL;        /* object token of loc_id */
     H5VL_loc_params_t loc_params;
     herr_t ret_value = SUCCEED;         /* Return value */
 
@@ -756,15 +701,12 @@ H5Gget_linkval(hid_t loc_id, const char *name, size_t size, char *buf/*out*/)
     loc_params.loc_data.loc_by_name.name = name;
     loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
 
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
+    /* get the location object */
+    if(NULL == (obj = (H5VL_object_t *)H5I_object(loc_id)))
+        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid location identifier")
 
     /* Get the link info through the VOL */
-    if((ret_value = H5VL_link_get(obj, loc_params, vol_plugin->cls, H5VL_LINK_GET_VAL, 
+    if((ret_value = H5VL_link_get(obj->vol_obj, loc_params, obj->vol_info->vol_cls, H5VL_LINK_GET_VAL, 
                                   H5AC_ind_dxpl_id, H5_REQUEST_NULL, buf, size)) < 0)
         HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get link value")
 
@@ -858,124 +800,6 @@ done:
     FUNC_LEAVE_API(ret_value)
 } /* end H5Gget_comment() */
 
-#if 0
-
-/*-------------------------------------------------------------------------
- * Function:	H5Gset_comment
- *
- * Purpose:     Gives the specified object a comment.  The COMMENT string
- *		should be a null terminated string.  An object can have only
- *		one comment at a time.  Passing NULL for the COMMENT argument
- *		will remove the comment property from the object.
- *
- * Note:	Deprecated in favor of H5Oset_comment/H5Oset_comment_by_name
- *
- * Return:	Non-negative on success/Negative on failure
- *
- * Programmer:	Robb Matzke
- *              Monday, July 20, 1998
- *
- *-------------------------------------------------------------------------
- */
-herr_t
-H5Gset_comment(hid_t loc_id, const char *name, const char *comment)
-{
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin;        /* VOL plugin information */
-    H5VL_loc_params_t loc_params;
-    herr_t      ret_value = SUCCEED;       /* Return value */
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE3("e", "i*s*s", loc_id, name, comment);
-
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-
-    loc_params.type = H5VL_OBJECT_BY_NAME;
-    loc_params.loc_data.loc_by_name.name = name;
-    loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    loc_params.obj_type = H5I_get_type(loc_id);
-
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
-
-    /* set comment on object through the VOL */
-    if(H5VL_object_optional(obj, vol_plugin->cls, H5AC_dxpl_id, H5_REQUEST_NULL, 
-                            H5VL_OBJECT_SET_COMMENT, loc_params, comment) < 0)
-	HGOTO_ERROR(H5E_SYM, H5E_CANTINIT, FAIL, "unable to set comment value")
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Gset_comment() */
-
-
-/*-------------------------------------------------------------------------
- * Function:	H5Gget_comment
- *
- * Purpose:	Return at most BUFSIZE characters of the comment for the
- *		specified object.  If BUFSIZE is large enough to hold the
- *		entire comment then the comment string will be null
- *		terminated, otherwise it will not.  If the object does not
- *		have a comment value then no bytes are copied to the BUF
- *		buffer.
- *
- * Note:	Deprecated in favor of H5Oget_comment/H5Oget_comment_by_name
- *
- * Return:	Success:	Number of characters in the comment counting
- *				the null terminator.  The value returned may
- *				be larger than the BUFSIZE argument.
- *
- *		Failure:	Negative
- *
- * Programmer:	Robb Matzke
- *              Monday, July 20, 1998
- *
- *-------------------------------------------------------------------------
- */
-int
-H5Gget_comment(hid_t loc_id, const char *name, size_t bufsize, char *buf)
-{
-    void    *obj = NULL;        /* object token of loc_id */
-    H5VL_t  *vol_plugin;        /* VOL plugin information */
-    H5VL_loc_params_t loc_params;
-    ssize_t size;
-    int	ret_value;
-
-    FUNC_ENTER_API(FAIL)
-    H5TRACE4("Is", "i*sz*s", loc_id, name, bufsize, buf);
-
-    if(!name || !*name)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no name specified")
-    if(bufsize > 0 && !buf)
-	HGOTO_ERROR(H5E_ARGS, H5E_BADVALUE, FAIL, "no buffer specified")
-
-    loc_params.type = H5VL_OBJECT_BY_NAME;
-    loc_params.loc_data.loc_by_name.name = name;
-    loc_params.loc_data.loc_by_name.lapl_id = H5P_LINK_ACCESS_DEFAULT;
-    loc_params.obj_type = H5I_get_type(loc_id);
-
-    /* get the file object */
-    if(NULL == (obj = (void *)H5I_object(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier")
-    /* get the plugin pointer */
-    if (NULL == (vol_plugin = (H5VL_t *)H5I_get_aux(loc_id)))
-        HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information")
-
-    if(H5VL_object_optional(obj, vol_plugin->cls, H5AC_dxpl_id, H5_REQUEST_NULL, 
-                            H5VL_OBJECT_GET_COMMENT, loc_params, buf, bufsize, &size) < 0)
-        HGOTO_ERROR(H5E_INTERNAL, H5E_CANTGET, FAIL, "unable to get object comment")
-
-    ret_value = (int)size;
-
-done:
-    FUNC_LEAVE_API(ret_value)
-} /* end H5Gget_comment() */
-#endif
-
 
 /*-------------------------------------------------------------------------
  * Function:	H5Giterate