The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1ebc14c900eb182ce238030b5d0db20b1815d431
commit 1ebc14c900eb182ce238030b5d0db20b1815d431 Author: Rick Macklem <[email protected]> AuthorDate: 2022-06-24 20:47:57 +0000 Commit: Rick Macklem <[email protected]> CommitDate: 2022-06-24 20:47:57 +0000 nfscommon: Clean up the code by not using the vnode_vtype() macro The vnode_vtype() macro was used to make the code compatible with Mac OSX, for the Mac OSX port. For FreeBSD, this macro just obscured the code, so avoid using it to clean up the code. This commit should not result in a semantics change. --- sys/fs/nfs/nfs_commonsubs.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/fs/nfs/nfs_commonsubs.c b/sys/fs/nfs/nfs_commonsubs.c index fd04843f2f03..4dbd96d27cd3 100644 --- a/sys/fs/nfs/nfs_commonsubs.c +++ b/sys/fs/nfs/nfs_commonsubs.c @@ -2691,7 +2691,7 @@ nfsv4_fillattr(struct nfsrv_descript *nd, struct mount *mp, vnode_t vp, * Recommended Attributes. (Only the supported ones.) */ case NFSATTRBIT_ACL: - retnum += nfsrv_buildacl(nd, aclp, vnode_vtype(vp), p); + retnum += nfsrv_buildacl(nd, aclp, vp->v_type, p); break; case NFSATTRBIT_ACLSUPPORT: NFSM_BUILD(tl, u_int32_t *, NFSX_UNSIGNED);
