diff options
| author | kib <kib@FreeBSD.org> | 2008-05-28 16:21:32 +0000 |
|---|---|---|
| committer | kib <kib@FreeBSD.org> | 2008-05-28 16:21:32 +0000 |
| commit | 2e00a34c1d8f3c9e2d57678d8ba231a2fa99bb7e (patch) | |
| tree | 90eaba1bf723fbf36179b1de6ec7dbc5182a48bf /sys/nfsserver | |
| parent | 3f5ef1985aed85300427485a566e0142032d88b4 (diff) | |
| download | FreeBSD-src-2e00a34c1d8f3c9e2d57678d8ba231a2fa99bb7e.zip FreeBSD-src-2e00a34c1d8f3c9e2d57678d8ba231a2fa99bb7e.tar.gz | |
Initialize vfslocked prior to calling nfsm_srvmtofh where it was forgotten.
Reported by: Andrew Edwards <aedwards sandvine com>
Tested by: pho
MFC after: 3 days
Diffstat (limited to 'sys/nfsserver')
| -rw-r--r-- | sys/nfsserver/nfs_serv.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sys/nfsserver/nfs_serv.c b/sys/nfsserver/nfs_serv.c index 04f743a..91d71e3 100644 --- a/sys/nfsserver/nfs_serv.c +++ b/sys/nfsserver/nfs_serv.c @@ -210,6 +210,7 @@ nfsrv3_access(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); if (!v3) panic("nfsrv3_access: v3 proc called on a v2 connection"); + vfslocked = 0; fhp = &nfh.fh_generic; nfsm_srvmtofh(fhp); tl = nfsm_dissect_nonblock(u_int32_t *, NFSX_UNSIGNED); @@ -1285,6 +1286,7 @@ nfsrv_writegather(struct nfsrv_descript **ndp, struct nfssvc_sock *slp, i = 0; len = 0; #endif + vfslocked = 0; *mrq = NULL; if (*ndp) { nfsd = *ndp; @@ -4132,6 +4134,7 @@ nfsrv_pathconf(struct nfsrv_descript *nfsd, struct nfssvc_sock *slp, nfsdbprintf(("%s %d\n", __FILE__, __LINE__)); if (!v3) panic("nfsrv_pathconf: v3 proc called on a v2 connection"); + vfslocked = 0; fhp = &nfh.fh_generic; nfsm_srvmtofh(fhp); error = nfsrv_fhtovp(fhp, 1, &vp, &vfslocked, cred, slp, |
