diff options
| author | Mateusz Guzik <[email protected]> | 2020-10-26 22:32:17 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-10-26 14:32:17 -0700 |
| commit | 01a65c5861fb445e2a1f7aeceeaa821b595281c2 (patch) | |
| tree | e15afec2b7ab44aba2e71511bd82a63907882269 /module | |
| parent | 3928ec53395fcc26be7844dd6b63df757166c281 (diff) | |
FreeBSD: catch up with 1300123 version bump
- removed thread argument from VOP_INACTIVE
- removed cred argument from VOP_VPTOCNP
Reviewed-by: Ryan Moeller <[email protected]>
Reviewed-by: Matt Macy <[email protected]>
Signed-off-by: Mateusz Guzik <[email protected]>
Closes #11104
Diffstat (limited to 'module')
| -rw-r--r-- | module/os/freebsd/zfs/zfs_vnops_os.c | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/module/os/freebsd/zfs/zfs_vnops_os.c b/module/os/freebsd/zfs/zfs_vnops_os.c index 497271fd8..5c1389532 100644 --- a/module/os/freebsd/zfs/zfs_vnops_os.c +++ b/module/os/freebsd/zfs/zfs_vnops_os.c @@ -5243,7 +5243,11 @@ zfs_freebsd_inactive(struct vop_inactive_args *ap) { vnode_t *vp = ap->a_vp; +#if __FreeBSD_version >= 1300123 + zfs_inactive(vp, curthread->td_ucred, NULL); +#else zfs_inactive(vp, ap->a_td->td_ucred, NULL); +#endif return (0); } @@ -5930,8 +5934,13 @@ zfs_vptocnp(struct vop_vptocnp_args *ap) error = vget(covered_vp, LK_SHARED | LK_VNHELD, curthread); #endif if (error == 0) { +#if __FreeBSD_version >= 1300123 + error = VOP_VPTOCNP(covered_vp, ap->a_vpp, ap->a_buf, + ap->a_buflen); +#else error = VOP_VPTOCNP(covered_vp, ap->a_vpp, ap->a_cred, ap->a_buf, ap->a_buflen); +#endif vput(covered_vp); } vn_lock(vp, ltype | LK_RETRY); |