Fixed two more bugs related to the merged cache changes.
Submitted by: John Dyson
This commit is contained in:
parent
ad21d87fd5
commit
efefea024a
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=6417
@ -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;
|
||||
}
|
||||
|
@ -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,
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user