diff options
| author | Ryan Moeller <[email protected]> | 2021-03-12 19:09:15 -0500 |
|---|---|---|
| committer | GitHub <[email protected]> | 2021-03-12 16:09:15 -0800 |
| commit | f845b2dd1c6048db6c67cd6072a9a976b1dcf6e4 (patch) | |
| tree | af31b040fb1577907b3ab76700d3f719c98c43e6 /module/os | |
| parent | e3e82dcc515586d460bb739ceb549443df26a863 (diff) | |
FreeBSD: Clean up zfsdev_close to match Linux
Resolve some oddities in zfsdev_close() which could result in a
panic and were not present in the equivalent function for Linux.
- Remove unused definition ZFS_MIN_MINOR
- FreeBSD: Simplify zfsdev state destruction
- Assert zs_minor is valid in zfsdev_close
- Make locking around zfsdev state match Linux
Reviewed-by: Brian Behlendorf <[email protected]>
Reviewed-by: Alexander Motin <[email protected]>
Signed-off-by: Ryan Moeller <[email protected]>
Closes #11720
Diffstat (limited to 'module/os')
| -rw-r--r-- | module/os/freebsd/zfs/kmod_core.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/module/os/freebsd/zfs/kmod_core.c b/module/os/freebsd/zfs/kmod_core.c index c11d4dbcf..d5ba0d93a 100644 --- a/module/os/freebsd/zfs/kmod_core.c +++ b/module/os/freebsd/zfs/kmod_core.c @@ -182,23 +182,21 @@ out: static void zfsdev_close(void *data) { - zfsdev_state_t *zs, *zsp = data; + zfsdev_state_t *zs = data; + + ASSERT(zs != NULL); mutex_enter(&zfsdev_state_lock); - for (zs = zfsdev_state_list; zs != NULL; zs = zs->zs_next) { - if (zs == zsp) - break; - } - if (zs == NULL || zs->zs_minor <= 0) { - mutex_exit(&zfsdev_state_lock); - return; - } + + ASSERT(zs->zs_minor != 0); + zs->zs_minor = -1; zfs_onexit_destroy(zs->zs_onexit); zfs_zevent_destroy(zs->zs_zevent); - mutex_exit(&zfsdev_state_lock); zs->zs_onexit = NULL; zs->zs_zevent = NULL; + + mutex_exit(&zfsdev_state_lock); } static int |