diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-08-19 19:19:51 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2014-08-19 19:19:51 (GMT) |
| commit | aff0124b38f2ba19cd06431f756ff5791882dbae (patch) | |
| tree | 7b00758d1f5f6a45690d21971c868d111a35367c /src/H5Fmount.c | |
| parent | ffc4b3a7f73e9e808bcb11a5f86ce9d6229f31f8 (diff) | |
| download | hdf5-aff0124b38f2ba19cd06431f756ff5791882dbae.zip hdf5-aff0124b38f2ba19cd06431f756ff5791882dbae.tar.gz hdf5-aff0124b38f2ba19cd06431f756ff5791882dbae.tar.bz2 | |
[svn-r25537] VOL framework changes.
Diffstat (limited to 'src/H5Fmount.c')
| -rw-r--r-- | src/H5Fmount.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/H5Fmount.c b/src/H5Fmount.c index 590275a..500852d 100644 --- a/src/H5Fmount.c +++ b/src/H5Fmount.c @@ -499,7 +499,7 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "ID does not contain VOL information") /* check if both objects are associated with the same VOL plugin */ - if (vol_plugin1->cls != vol_plugin2->cls) + if (vol_plugin1->cls->value != vol_plugin2->cls->value) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "Can't mount file onto object from different VOL plugin") /* get the group/file object */ @@ -509,8 +509,8 @@ H5Fmount(hid_t loc_id, const char *name, hid_t child_id, hid_t plist_id) if(NULL == (file = (void *)H5I_object(child_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier") - if((ret_value = H5VL_file_misc(obj, vol_plugin1, H5VL_FILE_MOUNT, H5AC_dxpl_id, H5_EVENT_STACK_NULL, - type, name, file, plist_id)) < 0) + if(H5VL_file_specific(obj, vol_plugin1, H5VL_FILE_MOUNT, H5AC_dxpl_id, + H5_REQUEST_NULL, type, name, file, plist_id) < 0) HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to mount file") done: @@ -565,7 +565,8 @@ H5Funmount(hid_t loc_id, const char *name) if(NULL == (obj = (void *)H5I_object(loc_id))) HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "invalid file identifier") - if((ret_value = H5VL_file_misc(obj, vol_plugin, H5VL_FILE_UNMOUNT, H5AC_dxpl_id, H5_EVENT_STACK_NULL, type, name)) < 0) + if(H5VL_file_specific(obj, vol_plugin, H5VL_FILE_UNMOUNT, H5AC_dxpl_id, + H5_REQUEST_NULL, type, name) < 0) HGOTO_ERROR(H5E_FILE, H5E_MOUNT, FAIL, "unable to unmount file") done: |