aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
authorMatthew Dillon <dillon@FreeBSD.org>2001-08-31 22:39:36 +0000
committerMatthew Dillon <dillon@FreeBSD.org>2001-08-31 22:39:36 +0000
commit4e174404a3ed58aae94eae446bc33e44acbbc6fe (patch)
treeb2ef069aa44273145bb651e4fcf4b9d67136586e /sys
parent2afac34da38d3fd02ff681a0505793003f91aebe (diff)
downloadsrc-4e174404a3ed58aae94eae446bc33e44acbbc6fe.tar.gz
src-4e174404a3ed58aae94eae446bc33e44acbbc6fe.zip
Pushdown Giant for nfs syscalls (nfssvc())
Notes
Notes: svn path=/head/; revision=82702
Diffstat (limited to 'sys')
-rw-r--r--sys/nfs/nfs_syscalls.c35
-rw-r--r--sys/nfsclient/nfs_nfsiod.c35
-rw-r--r--sys/nfsserver/nfs_syscalls.c35
3 files changed, 69 insertions, 36 deletions
diff --git a/sys/nfs/nfs_syscalls.c b/sys/nfs/nfs_syscalls.c
index a47d5a8e3329..e378cc52ad59 100644
--- a/sys/nfs/nfs_syscalls.c
+++ b/sys/nfs/nfs_syscalls.c
@@ -136,6 +136,9 @@ struct nfssvc_args {
caddr_t argp;
};
#endif
+/*
+ * MPSAFE
+ */
int
nfssvc(p, uap)
struct proc *p;
@@ -155,18 +158,22 @@ nfssvc(p, uap)
#endif /* NFS_NOSERVER */
int error;
+ mtx_lock(&Giant);
+
if ((uap->flag & NFSSVC_LOCKDANS) != 0) {
struct lockd_ans la;
error = copyin(uap->argp, &la, sizeof(la));
- return (error != 0 ? error : nfslockdans(p, &la));
+ if (error == 0)
+ error = nfslockdans(p, &la);
+ goto done2;
}
/*
* Must be super user
*/
error = suser(p);
- if(error)
- return (error);
+ if (error)
+ goto done2;
while (nfssvc_sockhead_flag & SLP_INIT) {
nfssvc_sockhead_flag |= SLP_WANTINIT;
(void) tsleep((caddr_t)&nfssvc_sockhead, PSOCK, "nfsd init", 0);
@@ -180,32 +187,34 @@ nfssvc(p, uap)
else if (uap->flag & NFSSVC_MNTD) {
error = copyin(uap->argp, (caddr_t)&ncd, sizeof (ncd));
if (error)
- return (error);
+ goto done2;
NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
ncd.ncd_dirp, p);
error = namei(&nd);
if (error)
- return (error);
+ goto done2;
NDFREE(&nd, NDF_ONLY_PNBUF);
if ((nd.ni_vp->v_flag & VROOT) == 0)
error = EINVAL;
nmp = VFSTONFS(nd.ni_vp->v_mount);
vput(nd.ni_vp);
if (error)
- return (error);
+ goto done2;
if ((nmp->nm_state & NFSSTA_MNTD) &&
- (uap->flag & NFSSVC_GOTAUTH) == 0)
- return (0);
+ (uap->flag & NFSSVC_GOTAUTH) == 0) {
+ error = 0;
+ goto done2;
+ }
nmp->nm_state |= NFSSTA_MNTD;
error = nqnfs_clientd(nmp, p->p_ucred, &ncd, uap->flag,
uap->argp, p);
} else if (uap->flag & NFSSVC_ADDSOCK) {
error = copyin(uap->argp, (caddr_t)&nfsdarg, sizeof(nfsdarg));
if (error)
- return (error);
+ goto done2;
error = holdsock(p->p_fd, nfsdarg.sock, &fp);
if (error)
- return (error);
+ goto done2;
/*
* Get the client address for connected sockets.
*/
@@ -216,7 +225,7 @@ nfssvc(p, uap)
nfsdarg.namelen);
if (error) {
fdrop(fp, p);
- return (error);
+ goto done2;
}
}
error = nfssvc_addsock(fp, nam, p);
@@ -224,7 +233,7 @@ nfssvc(p, uap)
} else {
error = copyin(uap->argp, (caddr_t)nsd, sizeof (*nsd));
if (error)
- return (error);
+ goto done2;
if ((uap->flag & NFSSVC_AUTHIN) &&
((nfsd = nsd->nsd_nfsd)) != NULL &&
(nfsd->nfsd_slp->ns_flag & SLP_VALID)) {
@@ -323,6 +332,8 @@ nfssvc(p, uap)
#endif /* NFS_NOSERVER */
if (error == EINTR || error == ERESTART)
error = 0;
+done2:
+ mtx_unlock(&Giant);
return (error);
}
diff --git a/sys/nfsclient/nfs_nfsiod.c b/sys/nfsclient/nfs_nfsiod.c
index a47d5a8e3329..e378cc52ad59 100644
--- a/sys/nfsclient/nfs_nfsiod.c
+++ b/sys/nfsclient/nfs_nfsiod.c
@@ -136,6 +136,9 @@ struct nfssvc_args {
caddr_t argp;
};
#endif
+/*
+ * MPSAFE
+ */
int
nfssvc(p, uap)
struct proc *p;
@@ -155,18 +158,22 @@ nfssvc(p, uap)
#endif /* NFS_NOSERVER */
int error;
+ mtx_lock(&Giant);
+
if ((uap->flag & NFSSVC_LOCKDANS) != 0) {
struct lockd_ans la;
error = copyin(uap->argp, &la, sizeof(la));
- return (error != 0 ? error : nfslockdans(p, &la));
+ if (error == 0)
+ error = nfslockdans(p, &la);
+ goto done2;
}
/*
* Must be super user
*/
error = suser(p);
- if(error)
- return (error);
+ if (error)
+ goto done2;
while (nfssvc_sockhead_flag & SLP_INIT) {
nfssvc_sockhead_flag |= SLP_WANTINIT;
(void) tsleep((caddr_t)&nfssvc_sockhead, PSOCK, "nfsd init", 0);
@@ -180,32 +187,34 @@ nfssvc(p, uap)
else if (uap->flag & NFSSVC_MNTD) {
error = copyin(uap->argp, (caddr_t)&ncd, sizeof (ncd));
if (error)
- return (error);
+ goto done2;
NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
ncd.ncd_dirp, p);
error = namei(&nd);
if (error)
- return (error);
+ goto done2;
NDFREE(&nd, NDF_ONLY_PNBUF);
if ((nd.ni_vp->v_flag & VROOT) == 0)
error = EINVAL;
nmp = VFSTONFS(nd.ni_vp->v_mount);
vput(nd.ni_vp);
if (error)
- return (error);
+ goto done2;
if ((nmp->nm_state & NFSSTA_MNTD) &&
- (uap->flag & NFSSVC_GOTAUTH) == 0)
- return (0);
+ (uap->flag & NFSSVC_GOTAUTH) == 0) {
+ error = 0;
+ goto done2;
+ }
nmp->nm_state |= NFSSTA_MNTD;
error = nqnfs_clientd(nmp, p->p_ucred, &ncd, uap->flag,
uap->argp, p);
} else if (uap->flag & NFSSVC_ADDSOCK) {
error = copyin(uap->argp, (caddr_t)&nfsdarg, sizeof(nfsdarg));
if (error)
- return (error);
+ goto done2;
error = holdsock(p->p_fd, nfsdarg.sock, &fp);
if (error)
- return (error);
+ goto done2;
/*
* Get the client address for connected sockets.
*/
@@ -216,7 +225,7 @@ nfssvc(p, uap)
nfsdarg.namelen);
if (error) {
fdrop(fp, p);
- return (error);
+ goto done2;
}
}
error = nfssvc_addsock(fp, nam, p);
@@ -224,7 +233,7 @@ nfssvc(p, uap)
} else {
error = copyin(uap->argp, (caddr_t)nsd, sizeof (*nsd));
if (error)
- return (error);
+ goto done2;
if ((uap->flag & NFSSVC_AUTHIN) &&
((nfsd = nsd->nsd_nfsd)) != NULL &&
(nfsd->nfsd_slp->ns_flag & SLP_VALID)) {
@@ -323,6 +332,8 @@ nfssvc(p, uap)
#endif /* NFS_NOSERVER */
if (error == EINTR || error == ERESTART)
error = 0;
+done2:
+ mtx_unlock(&Giant);
return (error);
}
diff --git a/sys/nfsserver/nfs_syscalls.c b/sys/nfsserver/nfs_syscalls.c
index a47d5a8e3329..e378cc52ad59 100644
--- a/sys/nfsserver/nfs_syscalls.c
+++ b/sys/nfsserver/nfs_syscalls.c
@@ -136,6 +136,9 @@ struct nfssvc_args {
caddr_t argp;
};
#endif
+/*
+ * MPSAFE
+ */
int
nfssvc(p, uap)
struct proc *p;
@@ -155,18 +158,22 @@ nfssvc(p, uap)
#endif /* NFS_NOSERVER */
int error;
+ mtx_lock(&Giant);
+
if ((uap->flag & NFSSVC_LOCKDANS) != 0) {
struct lockd_ans la;
error = copyin(uap->argp, &la, sizeof(la));
- return (error != 0 ? error : nfslockdans(p, &la));
+ if (error == 0)
+ error = nfslockdans(p, &la);
+ goto done2;
}
/*
* Must be super user
*/
error = suser(p);
- if(error)
- return (error);
+ if (error)
+ goto done2;
while (nfssvc_sockhead_flag & SLP_INIT) {
nfssvc_sockhead_flag |= SLP_WANTINIT;
(void) tsleep((caddr_t)&nfssvc_sockhead, PSOCK, "nfsd init", 0);
@@ -180,32 +187,34 @@ nfssvc(p, uap)
else if (uap->flag & NFSSVC_MNTD) {
error = copyin(uap->argp, (caddr_t)&ncd, sizeof (ncd));
if (error)
- return (error);
+ goto done2;
NDINIT(&nd, LOOKUP, FOLLOW | LOCKLEAF, UIO_USERSPACE,
ncd.ncd_dirp, p);
error = namei(&nd);
if (error)
- return (error);
+ goto done2;
NDFREE(&nd, NDF_ONLY_PNBUF);
if ((nd.ni_vp->v_flag & VROOT) == 0)
error = EINVAL;
nmp = VFSTONFS(nd.ni_vp->v_mount);
vput(nd.ni_vp);
if (error)
- return (error);
+ goto done2;
if ((nmp->nm_state & NFSSTA_MNTD) &&
- (uap->flag & NFSSVC_GOTAUTH) == 0)
- return (0);
+ (uap->flag & NFSSVC_GOTAUTH) == 0) {
+ error = 0;
+ goto done2;
+ }
nmp->nm_state |= NFSSTA_MNTD;
error = nqnfs_clientd(nmp, p->p_ucred, &ncd, uap->flag,
uap->argp, p);
} else if (uap->flag & NFSSVC_ADDSOCK) {
error = copyin(uap->argp, (caddr_t)&nfsdarg, sizeof(nfsdarg));
if (error)
- return (error);
+ goto done2;
error = holdsock(p->p_fd, nfsdarg.sock, &fp);
if (error)
- return (error);
+ goto done2;
/*
* Get the client address for connected sockets.
*/
@@ -216,7 +225,7 @@ nfssvc(p, uap)
nfsdarg.namelen);
if (error) {
fdrop(fp, p);
- return (error);
+ goto done2;
}
}
error = nfssvc_addsock(fp, nam, p);
@@ -224,7 +233,7 @@ nfssvc(p, uap)
} else {
error = copyin(uap->argp, (caddr_t)nsd, sizeof (*nsd));
if (error)
- return (error);
+ goto done2;
if ((uap->flag & NFSSVC_AUTHIN) &&
((nfsd = nsd->nsd_nfsd)) != NULL &&
(nfsd->nfsd_slp->ns_flag & SLP_VALID)) {
@@ -323,6 +332,8 @@ nfssvc(p, uap)
#endif /* NFS_NOSERVER */
if (error == EINTR || error == ERESTART)
error = 0;
+done2:
+ mtx_unlock(&Giant);
return (error);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-30 21:35:33 +0000