From 1278a943cf550a520a3889ffbd0534ac54a286c0 Mon Sep 17 00:00:00 2001 From: Navdeep Parhar Date: Fri, 14 Oct 2022 12:14:43 -0700 Subject: [PATCH 1/4] virtio_9pfs: Catch up with 5b5b7e2ca2f. SAVENAME is no longer used. --- sys/dev/virtio/9pfs/virtfs_vnops.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sys/dev/virtio/9pfs/virtfs_vnops.c b/sys/dev/virtio/9pfs/virtfs_vnops.c index 29d00d9af07..bb05fcc5880 100644 --- a/sys/dev/virtio/9pfs/virtfs_vnops.c +++ b/sys/dev/virtio/9pfs/virtfs_vnops.c @@ -285,7 +285,9 @@ virtfs_lookup(struct vop_lookup_args *ap) error = VOP_ACCESS(dvp, VWRITE, cnp->cn_cred, curthread); if (!error) { +#if __FreeBSD_version < 1400068 cnp->cn_flags |= SAVENAME; +#endif return (EJUSTRETURN); } } @@ -304,8 +306,10 @@ virtfs_lookup(struct vop_lookup_args *ap) /* Check if the entry in cache is stale or not */ if ((virtfs_node_cmp(vp, &newfid->qid) == 0) && ((error = VOP_GETATTR(vp, &vattr, cnp->cn_cred)) == 0)) { +#if __FreeBSD_version < 1400068 if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN)) cnp->cn_flags |= SAVENAME; +#endif goto out; } /* @@ -439,8 +443,10 @@ virtfs_lookup(struct vop_lookup_args *ap) cnp->cn_nameptr[cnp->cn_namelen] = tmpchr; +#if __FreeBSD_version < 1400068 if (cnp->cn_nameiop != LOOKUP && (flags & ISLASTCN)) cnp->cn_flags |= SAVENAME; +#endif /* Store the result the cache if MAKEENTRY is specified in flags */ if ((cnp->cn_flags & MAKEENTRY) != 0) -- 2.38.0