Module Name: src
Committed By: haad
Date: Wed May 19 17:57:42 UTC 2010
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_ioctl.c
Log Message:
Do not call zfs_init and zfs_fini directly they will be called by vfs routines.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.4 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.5
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c:1.4 Sat Feb 27 23:43:53 2010
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_ioctl.c Wed May 19 17:57:42 2010
@@ -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);
