diff options
author | pjd <pjd@FreeBSD.org> | 2007-04-16 10:23:24 +0000 |
---|---|---|
committer | pjd <pjd@FreeBSD.org> | 2007-04-16 10:23:24 +0000 |
commit | 33ebe8ecb609a792fa92c763393b2c654252e6ca (patch) | |
tree | 434f88e55b01727c6269ee73eac0622356e8de41 | |
parent | b14b729d24ed31e3be9fd4afdb7f2001044ea2cd (diff) | |
download | FreeBSD-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>
-rw-r--r-- | sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c | 2 | ||||
-rw-r--r-- | 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 80af684..b50d6ce 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 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; |