]> git.proxmox.com Git - mirror_zfs.git/commitdiff
FreeBSD: update vaccess signature on most recent HEAD
authorMatthew Macy <mmacy@freebsd.org>
Fri, 7 Aug 2020 21:16:01 +0000 (14:16 -0700)
committerGitHub <noreply@github.com>
Fri, 7 Aug 2020 21:16:01 +0000 (14:16 -0700)
Reviewed-by: Alexander Motin <mav@FreeBSD.org>
Reviewed-by: Ryan Moeller <ryan@iXsystems.com>
Signed-off-by: Matt Macy <mmacy@FreeBSD.org>
Closes #10682

module/os/freebsd/zfs/zfs_vnops.c

index a872351119422dd53528633682370e28b4f667bb..2a4acf21582f0c66104f2886e23f24ce2869c5c3 100644 (file)
@@ -5284,8 +5284,13 @@ zfs_freebsd_access(struct vop_access_args *ap)
        if (error == 0) {
                accmode = ap->a_accmode & ~(VREAD|VWRITE|VEXEC|VAPPEND);
                if (accmode != 0) {
+#if __FreeBSD_version >= 1300105
+                       error = vaccess(vp->v_type, zp->z_mode, zp->z_uid,
+                           zp->z_gid, accmode, ap->a_cred);
+#else
                        error = vaccess(vp->v_type, zp->z_mode, zp->z_uid,
                            zp->z_gid, accmode, ap->a_cred, NULL);
+#endif
                }
        }