Remove mount options
[zfs.git] / module / zfs / zfs_vfsops.c
index 77bef00..8016766 100644 (file)
 #include "zfs_comutil.h"
 
 #ifdef HAVE_ZPL
-int zfsfstype;
-vfsops_t *zfs_vfsops = NULL;
-static major_t zfs_major;
-static minor_t zfs_minor;
-static kmutex_t        zfs_dev_mtx;
-
 extern int sys_shutdown;
 
-static int zfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr);
-static int zfs_umount(vfs_t *vfsp, int fflag, cred_t *cr);
-static int zfs_mountroot(vfs_t *vfsp, enum whymountroot);
-static int zfs_root(vfs_t *vfsp, vnode_t **vpp);
-static int zfs_statvfs(vfs_t *vfsp, struct statvfs64 *statp);
-static int zfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp);
-static void zfs_freevfs(vfs_t *vfsp);
-
-static const fs_operation_def_t zfs_vfsops_template[] = {
-       VFSNAME_MOUNT,          { .vfs_mount = zfs_mount },
-       VFSNAME_MOUNTROOT,      { .vfs_mountroot = zfs_mountroot },
-       VFSNAME_UNMOUNT,        { .vfs_unmount = zfs_umount },
-       VFSNAME_ROOT,           { .vfs_root = zfs_root },
-       VFSNAME_STATVFS,        { .vfs_statvfs = zfs_statvfs },
-       VFSNAME_SYNC,           { .vfs_sync = zfs_sync },
-       VFSNAME_VGET,           { .vfs_vget = zfs_vget },
-       VFSNAME_FREEVFS,        { .vfs_freevfs = zfs_freevfs },
-       NULL,                   NULL
-};
-
-static const fs_operation_def_t zfs_vfsops_eio_template[] = {
-       VFSNAME_FREEVFS,        { .vfs_freevfs =  zfs_freevfs },
-       NULL,                   NULL
-};
-
-/*
- * We need to keep a count of active fs's.
- * This is necessary to prevent our module
- * from being unloaded after a umount -f
- */
-static uint32_t        zfs_active_fs_count = 0;
-
-static char *noatime_cancel[] = { MNTOPT_ATIME, NULL };
-static char *atime_cancel[] = { MNTOPT_NOATIME, NULL };
-static char *noxattr_cancel[] = { MNTOPT_XATTR, NULL };
-static char *xattr_cancel[] = { MNTOPT_NOXATTR, NULL };
-
-/*
- * MO_DEFAULT is not used since the default value is determined
- * by the equivalent property.
- */
-static mntopt_t mntopts[] = {
-       { MNTOPT_NOXATTR, noxattr_cancel, NULL, 0, NULL },
-       { MNTOPT_XATTR, xattr_cancel, NULL, 0, NULL },
-       { MNTOPT_NOATIME, noatime_cancel, NULL, 0, NULL },
-       { MNTOPT_ATIME, atime_cancel, NULL, 0, NULL }
-};
-
-static mntopts_t zfs_mntopts = {
-       sizeof (mntopts) / sizeof (mntopt_t),
-       mntopts
-};
-
 /*ARGSUSED*/
 int
 zfs_sync(vfs_t *vfsp, short flag, cred_t *cr)
@@ -181,58 +122,7 @@ zfs_sync(vfs_t *vfsp, short flag, cred_t *cr)
 
        return (0);
 }
-
-static int
-zfs_create_unique_device(dev_t *dev)
-{
-       major_t new_major;
-
-       do {
-               ASSERT3U(zfs_minor, <=, MAXMIN32);
-               minor_t start = zfs_minor;
-               do {
-                       mutex_enter(&zfs_dev_mtx);
-                       if (zfs_minor >= MAXMIN32) {
-                               /*
-                                * If we're still using the real major
-                                * keep out of /dev/zfs and /dev/zvol minor
-                                * number space.  If we're using a getudev()'ed
-                                * major number, we can use all of its minors.
-                                */
-                               if (zfs_major == ddi_name_to_major(ZFS_DRIVER))
-                                       zfs_minor = ZFS_MIN_MINOR;
-                               else
-                                       zfs_minor = 0;
-                       } else {
-                               zfs_minor++;
-                       }
-                       *dev = makedevice(zfs_major, zfs_minor);
-                       mutex_exit(&zfs_dev_mtx);
-               } while (vfs_devismounted(*dev) && zfs_minor != start);
-               if (zfs_minor == start) {
-                       /*
-                        * We are using all ~262,000 minor numbers for the
-                        * current major number.  Create a new major number.
-                        */
-                       if ((new_major = getudev()) == (major_t)-1) {
-                               cmn_err(CE_WARN,
-                                   "zfs_mount: Can't get unique major "
-                                   "device number.");
-                               return (-1);
-                       }
-                       mutex_enter(&zfs_dev_mtx);
-                       zfs_major = new_major;
-                       zfs_minor = 0;
-
-                       mutex_exit(&zfs_dev_mtx);
-               } else {
-                       break;
-               }
-               /* CONSTANTCONDITION */
-       } while (1);
-
-       return (0);
-}
+EXPORT_SYMBOL(zfs_sync);
 
 static void
 atime_changed_cb(void *arg, uint64_t newval)
@@ -392,7 +282,7 @@ acl_inherit_changed_cb(void *arg, uint64_t newval)
        zfsvfs->z_acl_inherit = newval;
 }
 
-static int
+int
 zfs_register_callbacks(vfs_t *vfsp)
 {
        struct dsl_dataset *ds = NULL;
@@ -485,8 +375,8 @@ zfs_register_callbacks(vfs_t *vfsp)
                char osname[MAXNAMELEN];
 
                dmu_objset_name(os, osname);
-               if (error = dsl_prop_get_integer(osname, "nbmand", &nbmand,
-                   NULL)) {
+               if ((error = dsl_prop_get_integer(osname, "nbmand", &nbmand,
+                   NULL))) {
                        return (error);
                }
        }
@@ -561,6 +451,7 @@ unregister:
        return (error);
 
 }
+EXPORT_SYMBOL(zfs_register_callbacks);
 #endif /* HAVE_ZPL */
 
 static int
@@ -642,6 +533,8 @@ zfs_userquota_prop_to_obj(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type)
                return (zfsvfs->z_userquota_obj);
        case ZFS_PROP_GROUPQUOTA:
                return (zfsvfs->z_groupquota_obj);
+       default:
+               return (ENOTSUP);
        }
        return (0);
 }
@@ -687,6 +580,7 @@ zfs_userspace_many(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
        zap_cursor_fini(&zc);
        return (error);
 }
+EXPORT_SYMBOL(zfs_userspace_many);
 
 /*
  * buf must be big enough (eg, 32 bytes)
@@ -734,6 +628,7 @@ zfs_userspace_one(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
                err = 0;
        return (err);
 }
+EXPORT_SYMBOL(zfs_userspace_one);
 
 int
 zfs_set_userquota(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
@@ -795,6 +690,7 @@ zfs_set_userquota(zfsvfs_t *zfsvfs, zfs_userquota_prop_t type,
        dmu_tx_commit(tx);
        return (err);
 }
+EXPORT_SYMBOL(zfs_set_userquota);
 
 boolean_t
 zfs_fuid_overquota(zfsvfs_t *zfsvfs, boolean_t isgroup, uint64_t fuid)
@@ -819,6 +715,7 @@ zfs_fuid_overquota(zfsvfs_t *zfsvfs, boolean_t isgroup, uint64_t fuid)
                return (B_FALSE);
        return (used >= quota);
 }
+EXPORT_SYMBOL(zfs_fuid_overquota);
 
 boolean_t
 zfs_owner_overquota(zfsvfs_t *zfsvfs, znode_t *zp, boolean_t isgroup)
@@ -835,6 +732,7 @@ zfs_owner_overquota(zfsvfs_t *zfsvfs, znode_t *zp, boolean_t isgroup)
 
        return (zfs_fuid_overquota(zfsvfs, isgroup, fuid));
 }
+EXPORT_SYMBOL(zfs_owner_overquota);
 
 int
 zfsvfs_create(const char *osname, zfsvfs_t **zfvp)
@@ -873,7 +771,7 @@ zfsvfs_create(const char *osname, zfsvfs_t **zfvp)
                goto out;
        } else if (zfsvfs->z_version >
            zfs_zpl_version_map(spa_version(dmu_objset_spa(os)))) {
-               (void) printf("Can't mount a version %lld file system "
+               (void) printk("Can't mount a version %lld file system "
                    "on a version %lld pool\n. Pool must be upgraded to mount "
                    "this file system.", (u_longlong_t)zfsvfs->z_version,
                    (u_longlong_t)spa_version(dmu_objset_spa(os)));
@@ -1100,10 +998,9 @@ zfs_set_fuid_feature(zfsvfs_t *zfsvfs)
        zfsvfs->z_use_sa = USE_SA(zfsvfs->z_version, zfsvfs->z_os);
 }
 
-static int
+int
 zfs_domount(vfs_t *vfsp, char *osname)
 {
-       dev_t mount_dev;
        uint64_t recordsize, fsid_guid;
        int error = 0;
        zfsvfs_t *zfsvfs;
@@ -1120,18 +1017,10 @@ zfs_domount(vfs_t *vfsp, char *osname)
        vfsp->vfs_bcount = 0;
        vfsp->vfs_data = NULL;
 
-       if (zfs_create_unique_device(&mount_dev) == -1) {
-               error = ENODEV;
-               goto out;
-       }
-       ASSERT(vfs_devismounted(mount_dev) == 0);
-
-       if (error = dsl_prop_get_integer(osname, "recordsize", &recordsize,
-           NULL))
+       if ((error = dsl_prop_get_integer(osname, "recordsize",
+           &recordsize, NULL)))
                goto out;
 
-       vfsp->vfs_dev = mount_dev;
-       vfsp->vfs_fstype = zfsfstype;
        vfsp->vfs_bsize = recordsize;
        vfsp->vfs_flag |= VFS_NOTRUNC;
        vfsp->vfs_data = zfsvfs;
@@ -1147,8 +1036,7 @@ zfs_domount(vfs_t *vfsp, char *osname)
        fsid_guid = dmu_objset_fsid_guid(zfsvfs->z_os);
        ASSERT((fsid_guid & ~((1ULL<<56)-1)) == 0);
        vfsp->vfs_fsid.val[0] = fsid_guid;
-       vfsp->vfs_fsid.val[1] = ((fsid_guid>>32) << 8) |
-           zfsfstype & 0xFF;
+       vfsp->vfs_fsid.val[1] = ((fsid_guid>>32) << 8);
 
        /*
         * Set features for file system.
@@ -1169,7 +1057,7 @@ zfs_domount(vfs_t *vfsp, char *osname)
 
                atime_changed_cb(zfsvfs, B_FALSE);
                readonly_changed_cb(zfsvfs, B_TRUE);
-               if (error = dsl_prop_get_integer(osname, "xattr", &pval, NULL))
+               if ((error = dsl_prop_get_integer(osname,"xattr",&pval,NULL)))
                        goto out;
                xattr_changed_cb(zfsvfs, pval);
                zfsvfs->z_issnap = B_TRUE;
@@ -1188,12 +1076,11 @@ out:
        if (error) {
                dmu_objset_disown(zfsvfs->z_os, zfsvfs);
                zfsvfs_free(zfsvfs);
-       } else {
-               atomic_add_32(&zfs_active_fs_count, 1);
        }
 
        return (error);
 }
+EXPORT_SYMBOL(zfs_domount);
 
 void
 zfs_unregister_callbacks(zfsvfs_t *zfsvfs)
@@ -1237,62 +1124,9 @@ zfs_unregister_callbacks(zfsvfs_t *zfsvfs)
                    vscan_changed_cb, zfsvfs) == 0);
        }
 }
+EXPORT_SYMBOL(zfs_unregister_callbacks);
 
-/*
- * Convert a decimal digit string to a uint64_t integer.
- */
-static int
-str_to_uint64(char *str, uint64_t *objnum)
-{
-       uint64_t num = 0;
-
-       while (*str) {
-               if (*str < '0' || *str > '9')
-                       return (EINVAL);
-
-               num = num*10 + *str++ - '0';
-       }
-
-       *objnum = num;
-       return (0);
-}
-
-/*
- * The boot path passed from the boot loader is in the form of
- * "rootpool-name/root-filesystem-object-number'. Convert this
- * string to a dataset name: "rootpool-name/root-filesystem-name".
- */
-static int
-zfs_parse_bootfs(char *bpath, char *outpath)
-{
-       char *slashp;
-       uint64_t objnum;
-       int error;
-
-       if (*bpath == 0 || *bpath == '/')
-               return (EINVAL);
-
-       (void) strcpy(outpath, bpath);
-
-       slashp = strchr(bpath, '/');
-
-       /* if no '/', just return the pool name */
-       if (slashp == NULL) {
-               return (0);
-       }
-
-       /* if not a number, just return the root dataset name */
-       if (str_to_uint64(slashp+1, &objnum)) {
-               return (0);
-       }
-
-       *slashp = '\0';
-       error = dsl_dsobj_to_dsname(bpath, objnum, outpath);
-       *slashp = '/';
-
-       return (error);
-}
-
+#ifdef HAVE_MLSLABEL
 /*
  * zfs_check_global_label:
  *     Check that the hex label string is appropriate for the dataset
@@ -1320,328 +1154,9 @@ zfs_check_global_label(const char *dsname, const char *hexsl)
        }
        return (EACCES);
 }
+#endif /* HAVE_MLSLABEL */
 
-/*
- * zfs_mount_label_policy:
- *     Determine whether the mount is allowed according to MAC check.
- *     by comparing (where appropriate) label of the dataset against
- *     the label of the zone being mounted into.  If the dataset has
- *     no label, create one.
- *
- *     Returns:
- *              0 :    access allowed
- *             >0 :    error code, such as EACCES
- */
-static int
-zfs_mount_label_policy(vfs_t *vfsp, char *osname)
-{
-       int             error, retv;
-       zone_t          *mntzone = NULL;
-       ts_label_t      *mnt_tsl;
-       bslabel_t       *mnt_sl;
-       bslabel_t       ds_sl;
-       char            ds_hexsl[MAXNAMELEN];
-
-       retv = EACCES;                          /* assume the worst */
-
-       /*
-        * Start by getting the dataset label if it exists.
-        */
-       error = dsl_prop_get(osname, zfs_prop_to_name(ZFS_PROP_MLSLABEL),
-           1, sizeof (ds_hexsl), &ds_hexsl, NULL);
-       if (error)
-               return (EACCES);
-
-       /*
-        * If labeling is NOT enabled, then disallow the mount of datasets
-        * which have a non-default label already.  No other label checks
-        * are needed.
-        */
-       if (!is_system_labeled()) {
-               if (strcasecmp(ds_hexsl, ZFS_MLSLABEL_DEFAULT) == 0)
-                       return (0);
-               return (EACCES);
-       }
-
-       /*
-        * Get the label of the mountpoint.  If mounting into the global
-        * zone (i.e. mountpoint is not within an active zone and the
-        * zoned property is off), the label must be default or
-        * admin_low/admin_high only; no other checks are needed.
-        */
-       mntzone = zone_find_by_any_path(refstr_value(vfsp->vfs_mntpt), B_FALSE);
-       if (mntzone->zone_id == GLOBAL_ZONEID) {
-               uint64_t zoned;
-
-               zone_rele(mntzone);
-
-               if (dsl_prop_get_integer(osname,
-                   zfs_prop_to_name(ZFS_PROP_ZONED), &zoned, NULL))
-                       return (EACCES);
-               if (!zoned)
-                       return (zfs_check_global_label(osname, ds_hexsl));
-               else
-                       /*
-                        * This is the case of a zone dataset being mounted
-                        * initially, before the zone has been fully created;
-                        * allow this mount into global zone.
-                        */
-                       return (0);
-       }
-
-       mnt_tsl = mntzone->zone_slabel;
-       ASSERT(mnt_tsl != NULL);
-       label_hold(mnt_tsl);
-       mnt_sl = label2bslabel(mnt_tsl);
-
-       if (strcasecmp(ds_hexsl, ZFS_MLSLABEL_DEFAULT) == 0) {
-               /*
-                * The dataset doesn't have a real label, so fabricate one.
-                */
-               char *str = NULL;
-
-               if (l_to_str_internal(mnt_sl, &str) == 0 &&
-                   dsl_prop_set(osname, zfs_prop_to_name(ZFS_PROP_MLSLABEL),
-                   ZPROP_SRC_LOCAL, 1, strlen(str) + 1, str) == 0)
-                       retv = 0;
-               if (str != NULL)
-                       kmem_free(str, strlen(str) + 1);
-       } else if (hexstr_to_label(ds_hexsl, &ds_sl) == 0) {
-               /*
-                * Now compare labels to complete the MAC check.  If the
-                * labels are equal then allow access.  If the mountpoint
-                * label dominates the dataset label, allow readonly access.
-                * Otherwise, access is denied.
-                */
-               if (blequal(mnt_sl, &ds_sl))
-                       retv = 0;
-               else if (bldominates(mnt_sl, &ds_sl)) {
-                       vfs_setmntopt(vfsp, MNTOPT_RO, NULL, 0);
-                       retv = 0;
-               }
-       }
-
-       label_rele(mnt_tsl);
-       zone_rele(mntzone);
-       return (retv);
-}
-
-static int
-zfs_mountroot(vfs_t *vfsp, enum whymountroot why)
-{
-       int error = 0;
-       static int zfsrootdone = 0;
-       zfsvfs_t *zfsvfs = NULL;
-       znode_t *zp = NULL;
-       vnode_t *vp = NULL;
-       char *zfs_bootfs;
-       char *zfs_devid;
-
-       ASSERT(vfsp);
-
-       /*
-        * The filesystem that we mount as root is defined in the
-        * boot property "zfs-bootfs" with a format of
-        * "poolname/root-dataset-objnum".
-        */
-       if (why == ROOT_INIT) {
-               if (zfsrootdone++)
-                       return (EBUSY);
-               /*
-                * the process of doing a spa_load will require the
-                * clock to be set before we could (for example) do
-                * something better by looking at the timestamp on
-                * an uberblock, so just set it to -1.
-                */
-               clkset(-1);
-
-               if ((zfs_bootfs = spa_get_bootprop("zfs-bootfs")) == NULL) {
-                       cmn_err(CE_NOTE, "spa_get_bootfs: can not get "
-                           "bootfs name");
-                       return (EINVAL);
-               }
-               zfs_devid = spa_get_bootprop("diskdevid");
-               error = spa_import_rootpool(rootfs.bo_name, zfs_devid);
-               if (zfs_devid)
-                       spa_free_bootprop(zfs_devid);
-               if (error) {
-                       spa_free_bootprop(zfs_bootfs);
-                       cmn_err(CE_NOTE, "spa_import_rootpool: error %d",
-                           error);
-                       return (error);
-               }
-               if (error = zfs_parse_bootfs(zfs_bootfs, rootfs.bo_name)) {
-                       spa_free_bootprop(zfs_bootfs);
-                       cmn_err(CE_NOTE, "zfs_parse_bootfs: error %d",
-                           error);
-                       return (error);
-               }
-
-               spa_free_bootprop(zfs_bootfs);
-
-               if (error = vfs_lock(vfsp))
-                       return (error);
-
-               if (error = zfs_domount(vfsp, rootfs.bo_name)) {
-                       cmn_err(CE_NOTE, "zfs_domount: error %d", error);
-                       goto out;
-               }
-
-               zfsvfs = (zfsvfs_t *)vfsp->vfs_data;
-               ASSERT(zfsvfs);
-               if (error = zfs_zget(zfsvfs, zfsvfs->z_root, &zp)) {
-                       cmn_err(CE_NOTE, "zfs_zget: error %d", error);
-                       goto out;
-               }
-
-               vp = ZTOV(zp);
-               mutex_enter(&vp->v_lock);
-               vp->v_flag |= VROOT;
-               mutex_exit(&vp->v_lock);
-               rootvp = vp;
-
-               /*
-                * Leave rootvp held.  The root file system is never unmounted.
-                */
-
-               vfs_add((struct vnode *)0, vfsp,
-                   (vfsp->vfs_flag & VFS_RDONLY) ? MS_RDONLY : 0);
-out:
-               vfs_unlock(vfsp);
-               return (error);
-       } else if (why == ROOT_REMOUNT) {
-               readonly_changed_cb(vfsp->vfs_data, B_FALSE);
-               vfsp->vfs_flag |= VFS_REMOUNT;
-
-               /* refresh mount options */
-               zfs_unregister_callbacks(vfsp->vfs_data);
-               return (zfs_register_callbacks(vfsp));
-
-       } else if (why == ROOT_UNMOUNT) {
-               zfs_unregister_callbacks((zfsvfs_t *)vfsp->vfs_data);
-               (void) zfs_sync(vfsp, 0, 0);
-               return (0);
-       }
-
-       /*
-        * if "why" is equal to anything else other than ROOT_INIT,
-        * ROOT_REMOUNT, or ROOT_UNMOUNT, we do not support it.
-        */
-       return (ENOTSUP);
-}
-
-/*ARGSUSED*/
-static int
-zfs_mount(vfs_t *vfsp, vnode_t *mvp, struct mounta *uap, cred_t *cr)
-{
-       char            *osname;
-       pathname_t      spn;
-       int             error = 0;
-       uio_seg_t       fromspace = (uap->flags & MS_SYSSPACE) ?
-           UIO_SYSSPACE : UIO_USERSPACE;
-       int             canwrite;
-
-       if (mvp->v_type != VDIR)
-               return (ENOTDIR);
-
-       mutex_enter(&mvp->v_lock);
-       if ((uap->flags & MS_REMOUNT) == 0 &&
-           (uap->flags & MS_OVERLAY) == 0 &&
-           (mvp->v_count != 1 || (mvp->v_flag & VROOT))) {
-               mutex_exit(&mvp->v_lock);
-               return (EBUSY);
-       }
-       mutex_exit(&mvp->v_lock);
-
-       /*
-        * ZFS does not support passing unparsed data in via MS_DATA.
-        * Users should use the MS_OPTIONSTR interface; this means
-        * that all option parsing is already done and the options struct
-        * can be interrogated.
-        */
-       if ((uap->flags & MS_DATA) && uap->datalen > 0)
-               return (EINVAL);
-
-       /*
-        * Get the objset name (the "special" mount argument).
-        */
-       if (error = pn_get(uap->spec, fromspace, &spn))
-               return (error);
-
-       osname = spn.pn_path;
-
-       /*
-        * Check for mount privilege?
-        *
-        * If we don't have privilege then see if
-        * we have local permission to allow it
-        */
-       error = secpolicy_fs_mount(cr, mvp, vfsp);
-       if (error) {
-               if (dsl_deleg_access(osname, ZFS_DELEG_PERM_MOUNT, cr) == 0) {
-                       vattr_t         vattr;
-
-                       /*
-                        * Make sure user is the owner of the mount point
-                        * or has sufficient privileges.
-                        */
-
-                       vattr.va_mask = AT_UID;
-
-                       if (VOP_GETATTR(mvp, &vattr, 0, cr, NULL)) {
-                               goto out;
-                       }
-
-                       if (secpolicy_vnode_owner(cr, vattr.va_uid) != 0 &&
-                           VOP_ACCESS(mvp, VWRITE, 0, cr, NULL) != 0) {
-                               goto out;
-                       }
-                       secpolicy_fs_mount_clearopts(cr, vfsp);
-               } else {
-                       goto out;
-               }
-       }
-
-       /*
-        * Refuse to mount a filesystem if we are in a local zone and the
-        * dataset is not visible.
-        */
-       if (!INGLOBALZONE(curproc) &&
-           (!zone_dataset_visible(osname, &canwrite) || !canwrite)) {
-               error = EPERM;
-               goto out;
-       }
-
-       error = zfs_mount_label_policy(vfsp, osname);
-       if (error)
-               goto out;
-
-       /*
-        * When doing a remount, we simply refresh our temporary properties
-        * according to those options set in the current VFS options.
-        */
-       if (uap->flags & MS_REMOUNT) {
-               /* refresh mount options */
-               zfs_unregister_callbacks(vfsp->vfs_data);
-               error = zfs_register_callbacks(vfsp);
-               goto out;
-       }
-
-       error = zfs_domount(vfsp, osname);
-
-       /*
-        * Add an extra VFS_HOLD on our parent vfs so that it can't
-        * disappear due to a forced unmount.
-        */
-       if (error == 0 && ((zfsvfs_t *)vfsp->vfs_data)->z_issnap)
-               VFS_HOLD(mvp->v_vfsp);
-
-out:
-       pn_free(&spn);
-       return (error);
-}
-
-static int
+int
 zfs_statvfs(vfs_t *vfsp, struct statvfs64 *statp)
 {
        zfsvfs_t *zfsvfs = vfsp->vfs_data;
@@ -1689,7 +1204,7 @@ zfs_statvfs(vfs_t *vfsp, struct statvfs64 *statp)
        /*
         * We're a zfs filesystem.
         */
-       (void) strcpy(statp->f_basetype, vfssw[vfsp->vfs_fstype].vsw_name);
+       (void) strcpy(statp->f_basetype, MNTTYPE_ZFS);
 
        statp->f_flag = vf_to_stf(vfsp->vfs_flag);
 
@@ -1704,8 +1219,9 @@ zfs_statvfs(vfs_t *vfsp, struct statvfs64 *statp)
        ZFS_EXIT(zfsvfs);
        return (0);
 }
+EXPORT_SYMBOL(zfs_statvfs);
 
-static int
+int
 zfs_root(vfs_t *vfsp, vnode_t **vpp)
 {
        zfsvfs_t *zfsvfs = vfsp->vfs_data;
@@ -1721,6 +1237,7 @@ zfs_root(vfs_t *vfsp, vnode_t **vpp)
        ZFS_EXIT(zfsvfs);
        return (error);
 }
+EXPORT_SYMBOL(zfs_root);
 
 /*
  * Teardown the zfsvfs::z_os.
@@ -1819,7 +1336,7 @@ zfsvfs_teardown(zfsvfs_t *zfsvfs, boolean_t unmounting)
 }
 
 /*ARGSUSED*/
-static int
+int
 zfs_umount(vfs_t *vfsp, int fflag, cred_t *cr)
 {
        zfsvfs_t *zfsvfs = vfsp->vfs_data;
@@ -1902,8 +1419,9 @@ zfs_umount(vfs_t *vfsp, int fflag, cred_t *cr)
 
        return (0);
 }
+EXPORT_SYMBOL(zfs_umount);
 
-static int
+int
 zfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp)
 {
        zfsvfs_t        *zfsvfs = vfsp->vfs_data;
@@ -1968,7 +1486,7 @@ zfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp)
        gen_mask = -1ULL >> (64 - 8 * i);
 
        dprintf("getting %llu [%u mask %llx]\n", object, fid_gen, gen_mask);
-       if (err = zfs_zget(zfsvfs, object, &zp)) {
+       if ((err = zfs_zget(zfsvfs, object, &zp))) {
                ZFS_EXIT(zfsvfs);
                return (err);
        }
@@ -1985,9 +1503,13 @@ zfs_vget(vfs_t *vfsp, vnode_t **vpp, fid_t *fidp)
        }
 
        *vpp = ZTOV(zp);
+       if (*vpp)
+               zfs_inode_update(VTOZ(*vpp));
+
        ZFS_EXIT(zfsvfs);
        return (0);
 }
+EXPORT_SYMBOL(zfs_vget);
 
 /*
  * Block out VOPs and close zfsvfs_t::z_os
@@ -2006,6 +1528,7 @@ zfs_suspend_fs(zfsvfs_t *zfsvfs)
 
        return (0);
 }
+EXPORT_SYMBOL(zfs_suspend_fs);
 
 /*
  * Reopen zfsvfs_t::z_os and release VOPs.
@@ -2069,83 +1592,22 @@ bail:
        }
        return (err);
 }
+EXPORT_SYMBOL(zfs_resume_fs);
 
 static void
 zfs_freevfs(vfs_t *vfsp)
 {
        zfsvfs_t *zfsvfs = vfsp->vfs_data;
 
-       /*
-        * If this is a snapshot, we have an extra VFS_HOLD on our parent
-        * from zfs_mount().  Release it here.  If we came through
-        * zfs_mountroot() instead, we didn't grab an extra hold, so
-        * skip the VFS_RELE for rootvfs.
-        */
-       if (zfsvfs->z_issnap && (vfsp != rootvfs))
-               VFS_RELE(zfsvfs->z_parent->z_vfs);
-
        zfsvfs_free(zfsvfs);
-
-       atomic_add_32(&zfs_active_fs_count, -1);
-}
-
-/*
- * VFS_INIT() initialization.  Note that there is no VFS_FINI(),
- * so we can't safely do any non-idempotent initialization here.
- * Leave that to zfs_init() and zfs_fini(), which are called
- * from the module's _init() and _fini() entry points.
- */
-/*ARGSUSED*/
-static int
-zfs_vfsinit(int fstype, char *name)
-{
-       int error;
-
-       zfsfstype = fstype;
-
-       /*
-        * Setup vfsops and vnodeops tables.
-        */
-       error = vfs_setfsops(fstype, zfs_vfsops_template, &zfs_vfsops);
-       if (error != 0) {
-               cmn_err(CE_WARN, "zfs: bad vfs ops template");
-       }
-
-       error = zfs_create_op_tables();
-       if (error) {
-               zfs_remove_op_tables();
-               cmn_err(CE_WARN, "zfs: bad vnode ops template");
-               (void) vfs_freevfsops_by_type(zfsfstype);
-               return (error);
-       }
-
-       mutex_init(&zfs_dev_mtx, NULL, MUTEX_DEFAULT, NULL);
-
-       /*
-        * Unique major number for all zfs mounts.
-        * If we run out of 32-bit minors, we'll getudev() another major.
-        */
-       zfs_major = ddi_name_to_major(ZFS_DRIVER);
-       zfs_minor = ZFS_MIN_MINOR;
-
-       return (0);
 }
 #endif /* HAVE_ZPL */
 
 void
 zfs_init(void)
 {
-#ifdef HAVE_ZPL
-       /*
-        * Initialize .zfs directory structures
-        */
        zfsctl_init();
-
-       /*
-        * Initialize znode cache, vnode ops, etc...
-        */
        zfs_znode_init();
-#endif /* HAVE_ZPL */
 
        dmu_objset_register_type(DMU_OST_ZFS, zfs_space_delta_cb);
 }
@@ -2153,10 +1615,8 @@ zfs_init(void)
 void
 zfs_fini(void)
 {
-#ifdef HAVE_ZPL
        zfsctl_fini();
        zfs_znode_fini();
-#endif /* HAVE_ZPL */
 }
 
 #ifdef HAVE_ZPL
@@ -2227,6 +1687,7 @@ zfs_set_version(zfsvfs_t *zfsvfs, uint64_t newvers)
 
        return (0);
 }
+EXPORT_SYMBOL(zfs_set_version);
 #endif /* HAVE_ZPL */
 
 /*
@@ -2270,18 +1731,3 @@ zfs_get_zplprop(objset_t *os, zfs_prop_t prop, uint64_t *value)
        }
        return (error);
 }
-
-#ifdef HAVE_ZPL
-static vfsdef_t vfw = {
-       VFSDEF_VERSION,
-       MNTTYPE_ZFS,
-       zfs_vfsinit,
-       VSW_HASPROTO|VSW_CANRWRO|VSW_CANREMOUNT|VSW_VOLATILEDEV|VSW_STATS|
-           VSW_XID|VSW_ZMOUNT,
-       &zfs_mntopts
-};
-
-struct modlfs zfs_modlfs = {
-       &mod_fsops, "ZFS filesystem version " SPA_VERSION_STRING, &vfw
-};
-#endif /* HAVE_ZPL */