From owner-dev-commits-src-main@freebsd.org Sat Oct 2 00:58:31 2021 Return-Path: Delivered-To: dev-commits-src-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 69E81671A98; Sat, 2 Oct 2021 00:58:31 +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 4HLpWW2crbz3sjg; Sat, 2 Oct 2021 00:58:31 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 38205163A; Sat, 2 Oct 2021 00:58:31 +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 1920wVNV045060; Sat, 2 Oct 2021 00:58:31 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1920wVqR045059; Sat, 2 Oct 2021 00:58:31 GMT (envelope-from git) Date: Sat, 2 Oct 2021 00:58:31 GMT Message-Id: <202110020058.1920wVqR045059@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mateusz Guzik Subject: git: ef7d2c1fc160 - main - nfs: eliminate thread argument from nfsvno_namei MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mjg X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ef7d2c1fc1605acdbffb233925ab69f8d57de22a Auto-Submitted: auto-generated X-BeenThere: dev-commits-src-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for the main branch of the src repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 02 Oct 2021 00:58:31 -0000 The branch main has been updated by mjg: URL: https://cgit.FreeBSD.org/src/commit/?id=ef7d2c1fc1605acdbffb233925ab69f8d57de22a commit ef7d2c1fc1605acdbffb233925ab69f8d57de22a Author: Mateusz Guzik AuthorDate: 2021-10-01 21:20:15 +0000 Commit: Mateusz Guzik CommitDate: 2021-10-02 00:57:20 +0000 nfs: eliminate thread argument from nfsvno_namei This is a step towards retiring struct componentname cn_thread Reviewed by: rmacklem Differential Revision: https://reviews.freebsd.org/D32267 --- sys/fs/nfs/nfs_var.h | 2 +- sys/fs/nfsserver/nfs_nfsdport.c | 4 ++-- sys/fs/nfsserver/nfs_nfsdserv.c | 24 ++++++++++++------------ 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sys/fs/nfs/nfs_var.h b/sys/fs/nfs/nfs_var.h index bae4affa72e2..ebb23d28420b 100644 --- a/sys/fs/nfs/nfs_var.h +++ b/sys/fs/nfs/nfs_var.h @@ -686,7 +686,7 @@ int nfsvno_getfh(vnode_t, fhandle_t *, NFSPROC_T *); int nfsvno_accchk(vnode_t, accmode_t, struct ucred *, struct nfsexstuff *, NFSPROC_T *, int, int, u_int32_t *); int nfsvno_namei(struct nfsrv_descript *, struct nameidata *, - vnode_t, int, struct nfsexstuff *, NFSPROC_T *, vnode_t *); + vnode_t, int, struct nfsexstuff *, vnode_t *); void nfsvno_setpathbuf(struct nameidata *, char **, u_long **); void nfsvno_relpathbuf(struct nameidata *); int nfsvno_readlink(vnode_t, struct ucred *, int, NFSPROC_T *, struct mbuf **, diff --git a/sys/fs/nfsserver/nfs_nfsdport.c b/sys/fs/nfsserver/nfs_nfsdport.c index 9250c0ce0a23..49cbd2c9de0f 100644 --- a/sys/fs/nfsserver/nfs_nfsdport.c +++ b/sys/fs/nfsserver/nfs_nfsdport.c @@ -594,7 +594,7 @@ nfsvno_setattr(struct vnode *vp, struct nfsvattr *nvap, struct ucred *cred, */ int nfsvno_namei(struct nfsrv_descript *nd, struct nameidata *ndp, - struct vnode *dp, int islocked, struct nfsexstuff *exp, struct thread *p, + struct vnode *dp, int islocked, struct nfsexstuff *exp, struct vnode **retdirp) { struct componentname *cnp = &ndp->ni_cnd; @@ -661,7 +661,7 @@ nfsvno_namei(struct nfsrv_descript *nd, struct nameidata *ndp, * because lookup() will dereference ni_startdir. */ - cnp->cn_thread = p; + cnp->cn_thread = curthread; ndp->ni_startdir = dp; ndp->ni_rootdir = rootvnode; ndp->ni_topdir = NULL; diff --git a/sys/fs/nfsserver/nfs_nfsdserv.c b/sys/fs/nfsserver/nfs_nfsdserv.c index 4394d3033fce..3b2e6c82276d 100644 --- a/sys/fs/nfsserver/nfs_nfsdserv.c +++ b/sys/fs/nfsserver/nfs_nfsdserv.c @@ -612,7 +612,7 @@ nfsrvd_lookup(struct nfsrv_descript *nd, __unused int isdgram, goto out; } if (!nd->nd_repstat) { - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, &dirp); } else { vrele(dp); nfsvno_relpathbuf(&named); @@ -1214,7 +1214,7 @@ nfsrvd_create(struct nfsrv_descript *nd, __unused int isdgram, goto out; } - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, &dirp); if (dirp) { if (nd->nd_flag & ND_NFSV2) { vrele(dirp); @@ -1420,7 +1420,7 @@ nfsrvd_mknod(struct nfsrv_descript *nd, __unused int isdgram, if (vtyp == VDIR) named.ni_cnd.cn_flags |= WILLBEDIR; - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, &dirp); if (nd->nd_repstat) { if (dirp) { if (nd->nd_flag & ND_NFSV3) @@ -1543,7 +1543,7 @@ nfsrvd_remove(struct nfsrv_descript *nd, __unused int isdgram, goto out; } if (!nd->nd_repstat) { - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, &dirp); } else { vput(dp); nfsvno_relpathbuf(&named); @@ -1717,7 +1717,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgram, /* * Done parsing, now down to business. */ - nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, p, &fdirp); + nd->nd_repstat = nfsvno_namei(nd, &fromnd, dp, 0, exp, &fdirp); if (nd->nd_repstat) { if (nd->nd_flag & ND_NFSV3) { nfsrv_wcc(nd, fdirfor_ret, &fdirfor, fdiraft_ret, @@ -1734,7 +1734,7 @@ nfsrvd_rename(struct nfsrv_descript *nd, int isdgram, } if (vnode_vtype(fromnd.ni_vp) == VDIR) tond.ni_cnd.cn_flags |= WILLBEDIR; - nd->nd_repstat = nfsvno_namei(nd, &tond, tdp, 0, &tnes, p, &tdirp); + nd->nd_repstat = nfsvno_namei(nd, &tond, tdp, 0, &tnes, &tdirp); nd->nd_repstat = nfsvno_rename(&fromnd, &tond, nd->nd_repstat, nd->nd_flag, nd->nd_cred, p); if (fdirp) @@ -1829,7 +1829,7 @@ nfsrvd_link(struct nfsrv_descript *nd, int isdgram, } if (!nd->nd_repstat) { nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, &tnes, - p, &dirp); + &dirp); } else { if (dp) vrele(dp); @@ -1904,7 +1904,7 @@ nfsrvd_symlink(struct nfsrv_descript *nd, __unused int isdgram, goto out; } if (!nd->nd_repstat) { - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, &dirp); } else { vrele(dp); nfsvno_relpathbuf(&named); @@ -2028,7 +2028,7 @@ nfsrvd_mkdir(struct nfsrv_descript *nd, __unused int isdgram, } } if (!nd->nd_repstat) { - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, &dirp); } else { vrele(dp); nfsvno_relpathbuf(&named); @@ -3030,7 +3030,7 @@ nfsrvd_open(struct nfsrv_descript *nd, __unused int isdgram, } if (!nd->nd_repstat) { nd->nd_repstat = nfsvno_namei(nd, &named, dp, 0, exp, - p, &dirp); + &dirp); } else { vrele(dp); nfsvno_relpathbuf(&named); @@ -3688,7 +3688,7 @@ nfsrvd_secinfo(struct nfsrv_descript *nd, int isdgram, goto out; } if (!nd->nd_repstat) { - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, &dirp); } else { vput(dp); nfsvno_relpathbuf(&named); @@ -3822,7 +3822,7 @@ nfsrvd_secinfononame(struct nfsrv_descript *nd, int isdgram, goto nfsmout; } if (nd->nd_repstat == 0) - nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, p, &dirp); + nd->nd_repstat = nfsvno_namei(nd, &named, dp, 1, exp, &dirp); else vput(dp); if (dirp != NULL)