summaryrefslogtreecommitdiffstats
path: root/sys/nfs
diff options
context:
space:
mode:
authorphk <phk@FreeBSD.org>1997-09-10 21:27:40 +0000
committerphk <phk@FreeBSD.org>1997-09-10 21:27:40 +0000
commitd4697c2a95a093188f9d457064f3a6fc4e97b9ef (patch)
tree89bd0b9e6e95c6710c0bc5632c7d769b5ba7527e /sys/nfs
parent8244d6816f210995d91c7a9116a52b1ad65da584 (diff)
downloadFreeBSD-src-d4697c2a95a093188f9d457064f3a6fc4e97b9ef.zip
FreeBSD-src-d4697c2a95a093188f9d457064f3a6fc4e97b9ef.tar.gz
Don't repeat checks done at general level.
Diffstat (limited to 'sys/nfs')
-rw-r--r--sys/nfs/nfs_vnops.c11
1 files changed, 3 insertions, 8 deletions
diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 5e2f33b..a9bdb22 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)nfs_vnops.c 8.16 (Berkeley) 5/27/95
- * $Id: nfs_vnops.c,v 1.57 1997/09/10 19:52:27 phk Exp $
+ * $Id: nfs_vnops.c,v 1.58 1997/09/10 20:22:32 phk Exp $
*/
@@ -827,8 +827,8 @@ nfs_setattrrpc(vp, vap, cred, procp)
/*
* nfs lookup call, one step at a time...
- * First look in cache
- * If not found, unlock the directory nfsnode and do the rpc
+ * Generic stuff already done by vfs_cache_lookup()
+ * Unlock the directory nfsnode and do the rpc
*/
static int
nfs_lookup(ap)
@@ -857,12 +857,7 @@ nfs_lookup(ap)
int v3 = NFS_ISV3(dvp);
struct proc *p = cnp->cn_proc;
- if ((flags & ISLASTCN) && (dvp->v_mount->mnt_flag & MNT_RDONLY) &&
- (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME))
- return (EROFS);
*vpp = NULLVP;
- if (dvp->v_type != VDIR)
- return (ENOTDIR);
lockparent = flags & LOCKPARENT;
wantparent = flags & (LOCKPARENT|WANTPARENT);
nmp = VFSTONFS(dvp->v_mount);
OpenPOWER on IntegriCloud