d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't repeat checks done at general level.

Browse Source
This commit is contained in:
Poul-Henning Kamp 1997-09-10 21:27:40 +00:00
parent 563e33ad10
commit 69e86596a7
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=29293
2 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sys/nfs/nfs_vnops.c
View File

@ -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);

11
sys/nfsclient/nfs_vnops.c
View File

@ -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);