[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Do not call zfs_i...

[haad <haad%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c7ce0b29192b
branches:  trunk
changeset: 755004:c7ce0b29192b
user:      haad <haad%NetBSD.org@localhost>
date:      Wed May 19 17:57:42 2010 +0000

description:
Do not call zfs_init and zfs_fini directly they will be called by vfs routines.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c |  4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diffs (27 lines):

diff -r d2f3c52310f3 -r c7ce0b29192b external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Wed May 19 17:50:59 2010 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c    Wed May 19 17:57:42 2010 +0000
@@ -4626,14 +4626,13 @@
                        return error;
                }
                spa_init(FREAD | FWRITE);
-               zfs_init();
                zvol_init();
                zfs_vfsinit(16, MOUNT_ZFS); /* I need to use well defined args. */
                error = devsw_attach("zfs", &zfs_bdevsw, &zfs_bmajor,
                    &zfs_cdevsw, &zfs_cmajor);
                if (error != 0) {
                        zvol_fini();
-                       zfs_fini();
+                       zfs_vfsfini();
                        spa_fini();
                        lwp_specific_key_delete(zfs_fsyncer_key);
                        lwp_specific_key_delete(rrw_tsd_key);
@@ -4647,7 +4646,6 @@
                error = devsw_detach(&zfs_bdevsw, &zfs_cdevsw);
                zvol_fini();
                zfs_vfsfini();
-               zfs_fini();
                spa_fini();
                lwp_specific_key_delete(zfs_fsyncer_key);
                lwp_specific_key_delete(rrw_tsd_key);