From 8cb195f75813c8c96f3fd5a3e112298bc9cb9274 Mon Sep 17 00:00:00 2001 From: Pawel Jakub Dawidek Date: Mon, 16 Apr 2007 10:23:24 +0000 Subject: [PATCH] Uncomment forgotten check. Without this check in-place, ZFS will panic on unload instead of returning EBUSY. This check tells if there are mounted ZFS file systems or not. We can't unload if there are mounted file systems. Reported by: Andrey V. Elsukov --- sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 2 +- sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 80af684e0eb..b50d6cea477 100644 --- a/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -1795,7 +1795,7 @@ zfs_modevent(module_t mod, int type, void *unused __unused) error = 0; break; case MOD_UNLOAD: - if (spa_busy() || /* zfs_busy() || */ zvol_busy() || + if (spa_busy() || zfs_busy() || zvol_busy() || zio_injection_enabled) { error = EBUSY; break; diff --git a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c index 80af684e0eb..b50d6cea477 100644 --- a/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c +++ b/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c @@ -1795,7 +1795,7 @@ zfs_modevent(module_t mod, int type, void *unused __unused) error = 0; break; case MOD_UNLOAD: - if (spa_busy() || /* zfs_busy() || */ zvol_busy() || + if (spa_busy() || zfs_busy() || zvol_busy() || zio_injection_enabled) { error = EBUSY; break;