diff options
| author | Matt Macy <mmacy@FreeBSD.org> | 2020-10-01 23:09:24 +0000 |
|---|---|---|
| committer | Matt Macy <mmacy@FreeBSD.org> | 2020-10-01 23:09:24 +0000 |
| commit | e2228bd99047bb6a0cef0da931147b1f28f155c2 (patch) | |
| tree | 2859f65ec0723fe7424b97206b84c5d760d12b1c /module/os/freebsd/zfs/kmod_core.c | |
| parent | 01ea34f1d8bc20a76845a15e968388679693ee44 (diff) | |
| download | src-e2228bd99047bb6a0cef0da931147b1f28f155c2.tar.gz src-e2228bd99047bb6a0cef0da931147b1f28f155c2.zip | |
Update OpenZFS to 2.0.0-rc3-gfc5966vendor/openzfs/2.0-rc3-gfc5966
Notes
Notes:
svn path=/vendor-sys/openzfs/dist/; revision=366348
svn path=/vendor-sys/openzfs/2.0-rc3-gfc5966/; revision=366349; tag=vendor/openzfs/2.0-rc3-gfc5966
Diffstat (limited to 'module/os/freebsd/zfs/kmod_core.c')
| -rw-r--r-- | module/os/freebsd/zfs/kmod_core.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/module/os/freebsd/zfs/kmod_core.c b/module/os/freebsd/zfs/kmod_core.c index 4c696129857a..3a13271aac6f 100644 --- a/module/os/freebsd/zfs/kmod_core.c +++ b/module/os/freebsd/zfs/kmod_core.c @@ -86,6 +86,7 @@ __FBSDID("$FreeBSD$"); #include <sys/zio_checksum.h> #include <sys/vdev_removal.h> #include <sys/dsl_crypt.h> +#include <sys/zfs_context.h> #include <sys/zfs_ioctl_compat.h> #include <sys/zfs_ioctl_impl.h> @@ -98,7 +99,7 @@ __FBSDID("$FreeBSD$"); SYSCTL_DECL(_vfs_zfs); SYSCTL_DECL(_vfs_zfs_vdev); - +extern uint_t rrw_tsd_key; static int zfs_version_ioctl = ZFS_IOCVER_OZFS; SYSCTL_DECL(_vfs_zfs_version); SYSCTL_INT(_vfs_zfs_version, OID_AUTO, ioctl, CTLFLAG_RD, &zfs_version_ioctl, @@ -180,6 +181,7 @@ out: if (zcl) kmem_free(zcl, sizeof (zfs_cmd_legacy_t)); kmem_free(zc, sizeof (zfs_cmd_t)); + MPASS(tsd_get(rrw_tsd_key) == NULL); return (error); } |