diff options
Diffstat (limited to 'module')
| -rw-r--r-- | module/zfs/zfs_ctldir.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/module/zfs/zfs_ctldir.c b/module/zfs/zfs_ctldir.c index baa72863e..8a35c9947 100644 --- a/module/zfs/zfs_ctldir.c +++ b/module/zfs/zfs_ctldir.c @@ -355,8 +355,6 @@ snapentry_expire(void *data) static void zfsctl_snapshot_unmount_cancel(zfs_snapentry_t *se) { - ASSERT(RW_LOCK_HELD(&zfs_snapshot_lock)); - if (taskq_cancel_id(system_delay_taskq, se->se_taskqid) == 0) { se->se_taskqid = TASKQID_INVALID; zfsctl_snapshot_rele(se); @@ -567,13 +565,14 @@ zfsctl_destroy(zfsvfs_t *zfsvfs) uint64_t objsetid = dmu_objset_id(zfsvfs->z_os); rw_enter(&zfs_snapshot_lock, RW_WRITER); - if ((se = zfsctl_snapshot_find_by_objsetid(spa, objsetid)) - != NULL) { - zfsctl_snapshot_unmount_cancel(se); + se = zfsctl_snapshot_find_by_objsetid(spa, objsetid); + if (se != NULL) zfsctl_snapshot_remove(se); + rw_exit(&zfs_snapshot_lock); + if (se != NULL) { + zfsctl_snapshot_unmount_cancel(se); zfsctl_snapshot_rele(se); } - rw_exit(&zfs_snapshot_lock); } else if (zfsvfs->z_ctldir) { iput(zfsvfs->z_ctldir); zfsvfs->z_ctldir = NULL; |