From d7cafa8e3e8973bca6b2ebabafb669508031075e Mon Sep 17 00:00:00 2001 From: Brian Behlendorf Date: Wed, 5 Jan 2011 17:00:34 -0800 Subject: [PATCH] Remove zfs_active_fs_count This variable was used to ensure that the ZFS module is never removed while the filesystem is mounted. Once again the generic Linux VFS handles this case for us so it can be removed. --- module/zfs/zfs_vfsops.c | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/module/zfs/zfs_vfsops.c b/module/zfs/zfs_vfsops.c index 58d325f89..80cdb21b5 100644 --- a/module/zfs/zfs_vfsops.c +++ b/module/zfs/zfs_vfsops.c @@ -68,13 +68,6 @@ #ifdef HAVE_ZPL extern int sys_shutdown; -/* - * We need to keep a count of active fs's. - * This is necessary to prevent our module - * from being unloaded after a umount -f - */ -static uint32_t zfs_active_fs_count = 0; - static char *noatime_cancel[] = { MNTOPT_ATIME, NULL }; static char *atime_cancel[] = { MNTOPT_NOATIME, NULL }; static char *noxattr_cancel[] = { MNTOPT_XATTR, NULL }; @@ -1104,8 +1097,6 @@ out: if (error) { dmu_objset_disown(zfsvfs->z_os, zfsvfs); zfsvfs_free(zfsvfs); - } else { - atomic_add_32(&zfs_active_fs_count, 1); } return (error); @@ -1630,8 +1621,6 @@ zfs_freevfs(vfs_t *vfsp) zfsvfs_t *zfsvfs = vfsp->vfs_data; zfsvfs_free(zfsvfs); - - atomic_add_32(&zfs_active_fs_count, -1); } #endif /* HAVE_ZPL */ -- 2.40.0