From nobody Wed Jun 22 20:24:20 2022 X-Original-To: dev-commits-src-all@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 67EC2864BAC; Wed, 22 Jun 2022 20:24:20 +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 4LSvxJ2S5Cz3tG5; Wed, 22 Jun 2022 20:24:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655929460; 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=JujQoRcZkQXxcGHy4HytdX+qMzGKmNkSlLYkOWxi3gU=; b=pRRMTj8ZWY0ZdbIb+AyVPhRHQwA9yQ+sKKr4IUgC63r/zD2tPRkSr+PComQ9hu7kElrrul Z9789RHg5njXk/cOPSl6YAO1evwpDPYcpUEb1tl01U3IL/+75o3fATx7pgYWIvHXMs6WlP t0BXl15gw7fpvGKiIfV9IFwNI768V2h04dj3z2UjooACm5tNEMDeUFYx6FYyYaHNXqBPdv 1Fh2zL0j20nLv5aVQ8fKTIwsXXh4DyR0Q0Cu0G3/194GNUKry7PT8ZsyR5nOhlCNhjpZCb pGMhLRsP+jt0c+L4Tbtx3EJEudM8mSiTMZsxOGbcjZbK0IuDo542GgvkFaQUJA== 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 33F31523E; Wed, 22 Jun 2022 20:24:20 +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 25MKOKiu033857; Wed, 22 Jun 2022 20:24:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 25MKOK0a033856; Wed, 22 Jun 2022 20:24:20 GMT (envelope-from git) Date: Wed, 22 Jun 2022 20:24:20 GMT Message-Id: <202206222024.25MKOK0a033856@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: 5d3fe02c5a76 - main - nfsd: Clean up the code by not using the vnode_vtype() macro List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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: 5d3fe02c5a7649d35b9eaae1357376a643addb70 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1655929460; 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=JujQoRcZkQXxcGHy4HytdX+qMzGKmNkSlLYkOWxi3gU=; b=n9804dGbb3NBxEuoR8Mtok/xGOWmvYjJpDGj9us9jvxr5xTZJea/w5Vm3VbhdK0r1pTAPj g3NXxVbREIvy/2L6MgUjY/9nMXGxokEl3LRl9qqOcwJ9PvESEceZIqFWdxDQijvPajZIi3 /OMJ3QyE7Tzv/3M3whMuUwyJmstO3HgZ4dHhRZwzCPBGMAVI+MeY7g6r+jWksKdn0fG8ZD yY+l9uIdqaJi0rb+jbcq4xdzxxNsB6yAvVMwL91xixSWwWA56E1c07rM0zFCM5ay5+BRrd o6xbcE6Fi3qkapPNVS9XXojCiJaJxjokJO/8Z5jqFOiw8jT3ukxyVvNcB3i6qg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1655929460; a=rsa-sha256; cv=none; b=rDFR68vBOTi/ohAP6dKmJlQbX/0bzrGBrZX35xg1opuLsAzmAMKllYQvyodKLYO27sH93S Q4upeR0j0qNB5Xmc7UuDtT/6oikMVJJasvQUIoMwW7M/s/F6kMuulkdZ4zKWNn8mw5Fvam yM164ksWWNW+bFT2JcywOja+GMkKArnSDRhZvh/8IdkQgxZeFSX/9PNQ5jdawr9IPiu5ct 1uAcvT1EOcwI+x4laHrlGC6JwtbstwZ0AcsVc+S1v+v1XKDyEzEihr7eHTZ/G2ZUr7mcND h7+8nYTL6do+hryOAPjgA0vDRCIjjZWEyOPODDsnsGhARFERpLuGfq3VdSonIg== 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=5d3fe02c5a7649d35b9eaae1357376a643addb70 commit 5d3fe02c5a7649d35b9eaae1357376a643addb70 Author: Rick Macklem AuthorDate: 2022-06-22 20:20:32 +0000 Commit: Rick Macklem CommitDate: 2022-06-22 20:20:32 +0000 nfsd: 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/nfsserver/nfs_nfsdserv.c | 46 ++++++++++++++++++++-------------------- sys/fs/nfsserver/nfs_nfsdstate.c | 4 ++-- 2 files changed, 25 insertions(+), 25 deletions(-) diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 4cc14340d7d1..db1075596b91 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -198,7 +198,7 @@ nfsrvd_access(struct nfsrv_descript *nd, __unused int isdgram, NFSACCCHK_NOOVERRIDE, NFSACCCHK_VPISLOCKED, &supported)) nfsmode &= ~NFSACCESS_DELETE; } - if (vnode_vtype(vp) == VDIR) + if (vp->v_type == VDIR) testmode = NFSACCESS_LOOKUP; else testmode = NFSACCESS_EXECUTE; @@ -441,7 +441,7 @@ nfsrvd_setattr(struct nfsrv_descript *nd, __unused int isdgram, (vp->v_mount->mnt_flag & MNT_RDONLY)) nd->nd_repstat = EROFS; } else { - if (vnode_vtype(vp) != VREG) + if (vp->v_type != VREG) nd->nd_repstat = EINVAL; else if (nva2.na_uid != nd->nd_cred->cr_uid || NFSVNO_EXSTRICTACCESS(exp)) @@ -698,7 +698,7 @@ nfsrvd_readlink(struct nfsrv_descript *nd, __unused int isdgram, nfsrv_postopattr(nd, getret, &nva); goto out; } - if (vnode_vtype(vp) != VLNK) { + if (vp->v_type != VLNK) { if (nd->nd_flag & ND_NFSV2) nd->nd_repstat = ENXIO; else @@ -833,11 +833,11 @@ nfsrvd_read(struct nfsrv_descript *nd, __unused int isdgram, if (lop->lo_end < off) lop->lo_end = NFS64BITSSET; } - if (vnode_vtype(vp) != VREG) { + if (vp->v_type != VREG) { if (nd->nd_flag & ND_NFSV3) nd->nd_repstat = EINVAL; else - nd->nd_repstat = (vnode_vtype(vp) == VDIR) ? EISDIR : + nd->nd_repstat = (vp->v_type == VDIR) ? EISDIR : EINVAL; } getret = nfsvno_getattr(vp, &nva, nd, p, 1, NULL); @@ -1042,11 +1042,11 @@ nfsrvd_write(struct nfsrv_descript *nd, __unused int isdgram, if (retlen > nfs_srvmaxio || retlen < 0) nd->nd_repstat = EIO; - if (vnode_vtype(vp) != VREG && !nd->nd_repstat) { + if (vp->v_type != VREG && !nd->nd_repstat) { if (nd->nd_flag & ND_NFSV3) nd->nd_repstat = EINVAL; else - nd->nd_repstat = (vnode_vtype(vp) == VDIR) ? EISDIR : + nd->nd_repstat = (vp->v_type == VDIR) ? EISDIR : EINVAL; } NFSZERO_ATTRBIT(&attrbits); @@ -1567,7 +1567,7 @@ nfsrvd_remove(struct nfsrv_descript *nd, __unused int isdgram, } if (!nd->nd_repstat) { if (nd->nd_flag & ND_NFSV4) { - if (vnode_vtype(named.ni_vp) == VDIR) + if (named.ni_vp->v_type == VDIR) nd->nd_repstat = nfsvno_rmdirsub(&named, 1, nd->nd_cred, p, exp); else @@ -1740,7 +1740,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgram, nfsvno_relpathbuf(&tond); goto out; } - if (vnode_vtype(fromnd.ni_vp) == VDIR) + if (fromnd.ni_vp->v_type == VDIR) tond.ni_cnd.cn_flags |= WILLBEDIR; nd->nd_repstat = nfsvno_namei(nd, &tond, tdp, 0, &tnes, &tdirp); nd->nd_repstat = nfsvno_rename(&fromnd, &tond, nd->nd_repstat, @@ -1798,7 +1798,7 @@ nfsrvd_link(struct nfsrv_descript *nd, int isdgram, goto out; } NFSVOPUNLOCK(vp); - if (vnode_vtype(vp) == VDIR) { + if (vp->v_type == VDIR) { if (nd->nd_flag & ND_NFSV4) nd->nd_repstat = NFSERR_ISDIR; else @@ -2499,8 +2499,8 @@ nfsrvd_lock(struct nfsrv_descript *nd, __unused int isdgram, /* * Do basic access checking. */ - if (!nd->nd_repstat && vnode_vtype(vp) != VREG) { - if (vnode_vtype(vp) == VDIR) + if (!nd->nd_repstat && vp->v_type != VREG) { + if (vp->v_type == VDIR) nd->nd_repstat = NFSERR_ISDIR; else nd->nd_repstat = NFSERR_INVAL; @@ -2643,8 +2643,8 @@ nfsrvd_lockt(struct nfsrv_descript *nd, __unused int isdgram, error = nfsrv_mtostr(nd, stp->ls_owner, stp->ls_ownerlen); if (error) goto nfsmout; - if (!nd->nd_repstat && vnode_vtype(vp) != VREG) { - if (vnode_vtype(vp) == VDIR) + if (!nd->nd_repstat && vp->v_type != VREG) { + if (vp->v_type == VDIR) nd->nd_repstat = NFSERR_ISDIR; else nd->nd_repstat = NFSERR_INVAL; @@ -2775,8 +2775,8 @@ nfsrvd_locku(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_flag |= ND_IMPLIEDCLID; nd->nd_clientid.qval = clientid.qval; } - if (!nd->nd_repstat && vnode_vtype(vp) != VREG) { - if (vnode_vtype(vp) == VDIR) + if (!nd->nd_repstat && vp->v_type != VREG) { + if (vp->v_type == VDIR) nd->nd_repstat = NFSERR_ISDIR; else nd->nd_repstat = NFSERR_INVAL; @@ -3112,7 +3112,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, /* * Do basic access checking. */ - if (!nd->nd_repstat && vnode_vtype(vp) != VREG) { + if (!nd->nd_repstat && vp->v_type != VREG) { /* * The IETF working group decided that this is the correct * error return for all non-regular files. @@ -5411,7 +5411,7 @@ nfsrvd_allocate(struct nfsrv_descript *nd, __unused int isdgram, OFF_MAX || lop->lo_end < lop->lo_first)) nd->nd_repstat = NFSERR_INVAL; - if (nd->nd_repstat == 0 && vnode_vtype(vp) != VREG) + if (nd->nd_repstat == 0 && vp->v_type != VREG) nd->nd_repstat = NFSERR_WRONGTYPE; NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_OWNER); @@ -5519,7 +5519,7 @@ nfsrvd_deallocate(struct nfsrv_descript *nd, __unused int isdgram, nd->nd_repstat = NFSERR_INVAL; } - if (nd->nd_repstat == 0 && vnode_vtype(vp) != VREG) + if (nd->nd_repstat == 0 && vp->v_type != VREG) nd->nd_repstat = NFSERR_WRONGTYPE; NFSZERO_ATTRBIT(&attrbits); NFSSETBIT_ATTRBIT(&attrbits, NFSATTRBIT_OWNER); @@ -5633,7 +5633,7 @@ nfsrvd_copy_file_range(struct nfsrv_descript *nd, __unused int isdgram, outlop->lo_first)) nd->nd_repstat = NFSERR_INVAL; - if (nd->nd_repstat == 0 && vnode_vtype(vp) != VREG) + if (nd->nd_repstat == 0 && vp->v_type != VREG) nd->nd_repstat = NFSERR_WRONGTYPE; /* Check permissions for the input file. */ @@ -5657,7 +5657,7 @@ nfsrvd_copy_file_range(struct nfsrv_descript *nd, __unused int isdgram, error = NFSVOPLOCK(tovp, LK_SHARED); if (error != 0) goto out; - if (vnode_vtype(tovp) != VREG) + if (tovp->v_type != VREG) nd->nd_repstat = NFSERR_WRONGTYPE; /* For the output file, we only need the Owner attribute. */ @@ -5799,9 +5799,9 @@ nfsrvd_seek(struct nfsrv_descript *nd, __unused int isdgram, cmd = FIOSEEKHOLE; else nd->nd_repstat = NFSERR_BADXDR; - if (nd->nd_repstat == 0 && vnode_vtype(vp) == VDIR) + if (nd->nd_repstat == 0 && vp->v_type == VDIR) nd->nd_repstat = NFSERR_ISDIR; - if (nd->nd_repstat == 0 && vnode_vtype(vp) != VREG) + if (nd->nd_repstat == 0 && vp->v_type != VREG) nd->nd_repstat = NFSERR_WRONGTYPE; if (nd->nd_repstat == 0 && off < 0) nd->nd_repstat = NFSERR_NXIO; diff --git a/sys/fs/nfsserver/nfs_nfsdstate.c b/sys/fs/nfsserver/nfs_nfsdstate.c index 353ca80bc97e..419851895c7a 100644 --- a/sys/fs/nfsserver/nfs_nfsdstate.c +++ b/sys/fs/nfsserver/nfs_nfsdstate.c @@ -3471,8 +3471,8 @@ nfsrv_openupdate(vnode_t vp, struct nfsstate *new_stp, nfsquad_t clientid, ((nd->nd_flag & ND_NFSV41) != 0 && new_stp->ls_stateid.seqid != 0))) error = NFSERR_OLDSTATEID; - if (!error && vnode_vtype(vp) != VREG) { - if (vnode_vtype(vp) == VDIR) + if (!error && vp->v_type != VREG) { + if (vp->v_type == VDIR) error = NFSERR_ISDIR; else error = NFSERR_INVAL;