summaryrefslogtreecommitdiffstats
path: root/sys/contrib
diff options
context:
space:
mode:
authorpjd <pjd@FreeBSD.org>2007-04-16 10:23:24 +0000
committerpjd <pjd@FreeBSD.org>2007-04-16 10:23:24 +0000
commit33ebe8ecb609a792fa92c763393b2c654252e6ca (patch)
tree434f88e55b01727c6269ee73eac0622356e8de41 /sys/contrib
parentb14b729d24ed31e3be9fd4afdb7f2001044ea2cd (diff)
downloadFreeBSD-src-33ebe8ecb609a792fa92c763393b2c654252e6ca.zip
FreeBSD-src-33ebe8ecb609a792fa92c763393b2c654252e6ca.tar.gz
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 <bu7cher@yandex.ru>
Diffstat (limited to 'sys/contrib')
-rw-r--r--sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c2
1 files changed, 1 insertions, 1 deletions
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 80af684..b50d6ce 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;
OpenPOWER on IntegriCloud