diff options
author | dg <dg@FreeBSD.org> | 1995-02-15 03:40:00 +0000 |
---|---|---|
committer | dg <dg@FreeBSD.org> | 1995-02-15 03:40:00 +0000 |
commit | 65ebc47880e21099bf4f57558d71c6b892fcd23f (patch) | |
tree | b29d533c7c38fa33122c0b26818c9f225a38c7d8 | |
parent | 0e8333d2b1a50e7751ee25bff8b7420474dc31ae (diff) | |
download | FreeBSD-src-65ebc47880e21099bf4f57558d71c6b892fcd23f.zip FreeBSD-src-65ebc47880e21099bf4f57558d71c6b892fcd23f.tar.gz |
Fixed two more bugs related to the merged cache changes.
Submitted by: John Dyson
-rw-r--r-- | sys/nfs/nfs_common.c | 4 | ||||
-rw-r--r-- | sys/nfs/nfs_nqlease.c | 3 | ||||
-rw-r--r-- | sys/nfs/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/nfsclient/nfs_subs.c | 4 | ||||
-rw-r--r-- | sys/nfsserver/nfs_srvsubs.c | 4 |
5 files changed, 10 insertions, 9 deletions
diff --git a/sys/nfs/nfs_common.c b/sys/nfs/nfs_common.c index 7b2cf64..c31efa7 100644 --- a/sys/nfs/nfs_common.c +++ b/sys/nfs/nfs_common.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ + * $Id: nfs_subs.c,v 1.9 1995/02/06 02:20:40 davidg Exp $ */ /* @@ -961,7 +961,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, p) if (error) goto out; if (dp->v_type != VDIR) { - vrele(dp); + nfsrv_vrele(dp); error = ENOTDIR; goto out; } diff --git a/sys/nfs/nfs_nqlease.c b/sys/nfs/nfs_nqlease.c index eba21c0..c204ea6 100644 --- a/sys/nfs/nfs_nqlease.c +++ b/sys/nfs/nfs_nqlease.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_nqlease.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_nqlease.c,v 1.8 1995/01/09 16:05:06 davidg Exp $ + * $Id: nfs_nqlease.c,v 1.9 1995/01/29 06:37:13 bde Exp $ */ /* @@ -710,6 +710,7 @@ nqnfsrv_getlease(nfsd, mrep, md, dpos, cred, nam, mrq) nfsm_reply(0); if (rdonly && flags == NQL_WRITE) { error = EROFS; + nfsrv_vput(vp); nfsm_reply(0); } (void) nqsrv_getlease(vp, &nfsd->nd_duration, flags, nfsd, diff --git a/sys/nfs/nfs_subs.c b/sys/nfs/nfs_subs.c index 7b2cf64..c31efa7 100644 --- a/sys/nfs/nfs_subs.c +++ b/sys/nfs/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ + * $Id: nfs_subs.c,v 1.9 1995/02/06 02:20:40 davidg Exp $ */ /* @@ -961,7 +961,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, p) if (error) goto out; if (dp->v_type != VDIR) { - vrele(dp); + nfsrv_vrele(dp); error = ENOTDIR; goto out; } diff --git a/sys/nfsclient/nfs_subs.c b/sys/nfsclient/nfs_subs.c index 7b2cf64..c31efa7 100644 --- a/sys/nfsclient/nfs_subs.c +++ b/sys/nfsclient/nfs_subs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ + * $Id: nfs_subs.c,v 1.9 1995/02/06 02:20:40 davidg Exp $ */ /* @@ -961,7 +961,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, p) if (error) goto out; if (dp->v_type != VDIR) { - vrele(dp); + nfsrv_vrele(dp); error = ENOTDIR; goto out; } diff --git a/sys/nfsserver/nfs_srvsubs.c b/sys/nfsserver/nfs_srvsubs.c index 7b2cf64..c31efa7 100644 --- a/sys/nfsserver/nfs_srvsubs.c +++ b/sys/nfsserver/nfs_srvsubs.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)nfs_subs.c 8.3 (Berkeley) 1/4/94 - * $Id: nfs_subs.c,v 1.8 1995/01/09 16:05:08 davidg Exp $ + * $Id: nfs_subs.c,v 1.9 1995/02/06 02:20:40 davidg Exp $ */ /* @@ -961,7 +961,7 @@ nfs_namei(ndp, fhp, len, slp, nam, mdp, dposp, p) if (error) goto out; if (dp->v_type != VDIR) { - vrele(dp); + nfsrv_vrele(dp); error = ENOTDIR; goto out; } |