d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

zfs: merge openzfs/zfs@3522f57b6 (master) to main

Browse Source 
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
This commit is contained in:
Martin Matuska 2021-06-08 16:23:50 +02:00
commit ed9215c8e0
3 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_ctldir.c
View File

@ -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

1
sys/contrib/openzfs/module/os/freebsd/zfs/zfs_vnops_os.c
View File

@ -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

1
sys/contrib/openzfs/scripts/zfs-images Submodule

@ -0,0 +1 @@
Subproject commit 3331601f6dc50ef2c9779c1656218701b48b276c