Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

FreeBSD: Fix zvol_cdev_open locking 

First open locking changes were correctly applied to zvol_geom_open but
incorrectly applied to zvol_cdev_open, causing spa_namespace_lock to be
held indefinitely.

Make the first open locking in zvol_cdev_open match zvol_geom_open.

Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #13016
This commit is contained in:
Ryan Moeller 2022-01-26 14:23:39 -05:00 committed by Tony Hutter
parent 1828b68a0b
commit af1630c883
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
module/os/freebsd/zfs/zvol_os.c
View File

@ -928,8 +928,8 @@ retry:
*/ */
if (!mutex_owned(&spa_namespace_lock)) { if (!mutex_owned(&spa_namespace_lock)) {
if (!mutex_tryenter(&spa_namespace_lock)) { if (!mutex_tryenter(&spa_namespace_lock)) {
rw_exit(&zvol_state_lock); mutex_exit(&zv->zv_state_lock);
mutex_enter(&spa_namespace_lock); rw_exit(&zv->zv_suspend_lock);
kern_yield(PRI_USER); kern_yield(PRI_USER);
goto retry; goto retry;
} else { } else {