From nobody Fri Jun 24 20:49:02 2022 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D5DE1870B78; Fri, 24 Jun 2022 20:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4LV8Nt5kdsz4mH2; Fri, 24 Jun 2022 20:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656103742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0MElX/ySascBv87uaAMrvG6gd9QsUO2zmbkujBgJmyA=; b=rXkfwkU4CPv4/Kkw/9cFqdSzA6BYtR+W7BwIWrVHZDzLjC+AFY4x7YN0B8SJlZXZWdQs3Z 2s/tY7Z05/tGw99QJyXLmtH/6wSfpsHXX0wCU7S+Uh+n0cs5NEUm+vlABpRDRlKBxP8MLz vV8pKTjpFUVXnqRNy56XgRdWqVN4kCs8aC4xj79mE+ZBuY70cOA85dNqTlvn0ZdE/kOAD7 PZHSXZZk3OSzP3oh15eLduX70IQa4YlC308+2LIT7TbDeXpzt6sOyv3yE1mLlIgpwWZtyM 6LK+ekQMa6o0UMVlvvWsiTFSwg5n57AmBN+Ftlx0vH/Spe/Hn2qfchhGrWM1Dw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id A189716FCE; Fri, 24 Jun 2022 20:49:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 25OKn2qJ080040; Fri, 24 Jun 2022 20:49:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25OKn2kg080039; Fri, 24 Jun 2022 20:49:02 GMT (envelope-from git) Date: Fri, 24 Jun 2022 20:49:02 GMT Message-Id: <202206242049.25OKn2kg080039@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Rick Macklem Subject: git: 1ebc14c900eb - main - nfscommon: Clean up the code by not using the vnode_vtype() macro List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rmacklem X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1ebc14c900eb182ce238030b5d0db20b1815d431 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1656103742; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=0MElX/ySascBv87uaAMrvG6gd9QsUO2zmbkujBgJmyA=; b=Q0gtZFwjS9Wvjesa4hRAfBtuH7mY6jRTTZquuJFQ6smHLiYVZU8HPFChhgJ1hQsH/xT4zl WtMFiHeV5bo6jJ01LUSe5GbV9331aGBakKbl9SzgiZcMo6uzdqPh/LQ4jDd6efIwceVA+z TwOhy9CrAfxHEPCyHC9N4Ru59zhkmantfyzrTF3iymVlMJW2jRxmRwX7qJ8olwMGQy7/6T 0N/eCDYQG7/fcMCpnoyFAI49uUyu8V/ZxX/kI8hSwEF/8/XL1IwtjDi9xucF17+ReT3wKY Gf5ZDbDORdXf26FAXlvraMjEJGHXrEAACYqTjpcit1T4REYEMlIAQnsfuatlkA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1656103742; a=rsa-sha256; cv=none; b=r4bZtaR6d1VHHOq6DtWSZ/YCK+CgYJh//IeZZqdtYuARk/IcFEiGF0HlTXDevNgQYGxsg4 CDSKucn4YQALZAroLG2SC/USEHcvZm2aNAmqTyCLRu4tJtuUtb0SamP4e2+d2ZEWB7DB/M UiLCfCo1ceuVGGDfLyPwrAa0lx1YAlBo4ac4Rmf9liVLrDHhI/iOi/uM21tTUoRyaNGDFx LthWShCPV8IuizGYIafeot0rnJT4IDPs4UYu5SioAPsOvZJxI/IgH2x23UUg9QsmSgjmcX xfH+WcaBENIEUEEtWE9a5DCCmfDoqiOKdl3s17EoBrFqeEJSoRwfBl9ba0LWhw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rmacklem: URL: https://cgit.FreeBSD.org/src/commit/?id=1ebc14c900eb182ce238030b5d0db20b1815d431 commit 1ebc14c900eb182ce238030b5d0db20b1815d431 Author: Rick Macklem AuthorDate: 2022-06-24 20:47:57 +0000 Commit: Rick Macklem 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);