The branch main has been updated by mjg:
URL:
https://cgit.FreeBSD.org/src/commit/?id=ef7d2c1fc1605acdbffb233925ab69f8d57de22a
commit ef7d2c1fc1605acdbffb233925ab69f8d57de22a
Author: Mateusz Guzik <m...@freebsd.org>
AuthorDate: 2021-10-01 21:20:15 +0000
Commit: Mateusz Guzik <m...@freebsd.org>
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)
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"
