diff options
author | Martin Matuska <mm@FreeBSD.org> | 2021-06-08 14:23:50 +0000 |
---|---|---|
committer | Martin Matuska <mm@FreeBSD.org> | 2021-06-08 14:25:14 +0000 |
commit | ed9215c8e05f06c00683bb0624e82644796d4385 (patch) | |
tree | 9845999425336b16c1264d8c7d3e6493b82bf243 | |
parent | 97993d1ebf592ac6689a498d5d0d2afb46758680 (diff) | |
parent | 3522f57b6ada25bb58a88307971544ce49f39c66 (diff) | |
download | src-ed9215c8e05f06c00683bb0624e82644796d4385.tar.gz src-ed9215c8e05f06c00683bb0624e82644796d4385.zip |
zfs: merge openzfs/zfs@3522f57b6 (master) to main
This changes branch tracking of sys/contrib/openzfs to a new
direct-import branch vendor/openzfs/master.
No functional changes.
OpenZFS tag: 2.1.0-rc1
-rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c | 1 | ||||
-rw-r--r-- | sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c | 1 | ||||
m--------- | sys/contrib/openzfs/scripts/zfs-images | 0 |
3 files changed, 2 insertions, 0 deletions
diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c index f472aecdbafb..3ab4502bbc25 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c @@ -1223,6 +1223,7 @@ zfsctl_snapshot_vptocnp(struct vop_vptocnp_args *ap) * be covered. */ static struct vop_vector zfsctl_ops_snapshot = { + .vop_default = NULL, /* ensure very restricted access */ #if __FreeBSD_version >= 1300121 .vop_fplookup_vexec = VOP_EAGAIN, #endif diff --git a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c index 50454cad2468..f915b0ab1f03 100644 --- a/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5116,6 +5116,7 @@ zfs_freebsd_inactive(struct vop_inactive_args *ap) #ifndef _SYS_SYSPROTO_H_ struct vop_need_inactive_args { struct vnode *a_vp; + struct thread *a_td; }; #endif diff --git a/sys/contrib/openzfs/scripts/zfs-images b/sys/contrib/openzfs/scripts/zfs-images new file mode 160000 +Subproject 3331601f6dc50ef2c9779c1656218701b48b276 |