diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2020-09-18 23:21:24 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2020-09-18 23:21:24 +0000 |
| commit | 2c48331d28f16c0efce5a72a81e7d71668c4a158 (patch) | |
| tree | 3b7c79252e9c0d269630439a5ef3e9b8a9f8cc3e /sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | |
| parent | d8d2dda141c198a2e9863584e2e61566cc6b222d (diff) | |
| parent | 04bab0082226f7e72c41ad528298c43edc3fa316 (diff) | |
| download | src-2c48331d28f16c0efce5a72a81e7d71668c4a158.tar.gz src-2c48331d28f16c0efce5a72a81e7d71668c4a158.zip | |
MFV 2.0-rc2
- Fixes divide by zero for unusual hz
- remove cryptodev dependency
Notes
Notes:
svn path=/head/; revision=365894
Diffstat (limited to 'sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c')
| -rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c index 76e24b1bdf51..653f42239df9 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_znode.c @@ -384,7 +384,7 @@ zfs_znode_dmu_fini(znode_t *zp) { ASSERT(MUTEX_HELD(ZFS_OBJ_MUTEX(zp->z_zfsvfs, zp->z_id)) || zp->z_unlinked || - RW_WRITE_HELD(&zp->z_zfsvfs->z_teardown_inactive_lock)); + ZFS_TEARDOWN_INACTIVE_WLOCKED(zp->z_zfsvfs)); sa_handle_destroy(zp->z_sa_hdl); zp->z_sa_hdl = NULL; |