-
Notifications
You must be signed in to change notification settings - Fork 1.8k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
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 <behlendorf1@llnl.gov> Reviewed-by: Alexander Motin <mav@FreeBSD.org> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #11720
- Loading branch information
Ryan Moeller
authored
Mar 13, 2021
1 parent
e3e82dc
commit f845b2d
Showing
2 changed files
with
8 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -182,23 +182,21 @@ zfsdev_ioctl(struct cdev *dev, ulong_t zcmd, caddr_t arg, int flag, | |
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); | ||
This comment has been minimized.
Sorry, something went wrong.
This comment has been minimized.
Sorry, something went wrong.
grembo
Contributor
|
||
} | ||
|
||
static int | ||
|
@freqlabs Is moving the lock (mutex_exit) the change that fixed https://jira.ixsystems.com/browse/NAS-108891? I'm seeing a panic that looks exactly like what is described in the bug on FreeBSD 13.0-RELEASE/OpenZFS 2.0.0.