diff options
| author | phk <phk@FreeBSD.org> | 1997-09-10 19:43:15 +0000 |
|---|---|---|
| committer | phk <phk@FreeBSD.org> | 1997-09-10 19:43:15 +0000 |
| commit | e46083ff2604ff2b7570e358fd6f922b002544ab (patch) | |
| tree | 1fa2e059f837b06bc03f2470075b6032eca27669 | |
| parent | a5f03d21168831d040f3c686104ce4eb0b84dcaa (diff) | |
| download | FreeBSD-src-e46083ff2604ff2b7570e358fd6f922b002544ab.zip FreeBSD-src-e46083ff2604ff2b7570e358fd6f922b002544ab.tar.gz | |
This stuff is now done centrally.
| -rw-r--r-- | sys/fs/cd9660/cd9660_lookup.c | 16 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_lookup.c | 16 |
2 files changed, 2 insertions, 30 deletions
diff --git a/sys/fs/cd9660/cd9660_lookup.c b/sys/fs/cd9660/cd9660_lookup.c index 57393df..d416a98 100644 --- a/sys/fs/cd9660/cd9660_lookup.c +++ b/sys/fs/cd9660/cd9660_lookup.c @@ -38,7 +38,7 @@ * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_lookup.c,v 1.16 1997/08/02 14:31:18 bde Exp $ + * $Id: cd9660_lookup.c,v 1.17 1997/08/26 07:32:30 phk Exp $ */ #include <sys/param.h> @@ -71,9 +71,6 @@ * * Overall outline of ufs_lookup: * - * check accessibility of directory - * look for name in cache, if found, then if at end of path - * and deleting or creating, drop it, else return name * search for name in directory, to found or notfound * notfound: * if creating, return locked directory, leaving info on available slots @@ -134,17 +131,6 @@ cd9660_lookup(ap) wantparent = flags & (LOCKPARENT|WANTPARENT); /* - * Check accessiblity of directory. - */ - if (vdp->v_type != VDIR) - return (ENOTDIR); - if (error = VOP_ACCESS(vdp, VEXEC, cred, cnp->cn_proc)) - return (error); - if ((flags & ISLASTCN) && (vdp->v_mount->mnt_flag & MNT_RDONLY) && - (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) - return (EROFS); - - /* * We now have a segment name to search for, and a directory to search. */ diff --git a/sys/isofs/cd9660/cd9660_lookup.c b/sys/isofs/cd9660/cd9660_lookup.c index 57393df..d416a98 100644 --- a/sys/isofs/cd9660/cd9660_lookup.c +++ b/sys/isofs/cd9660/cd9660_lookup.c @@ -38,7 +38,7 @@ * from: @(#)ufs_lookup.c 7.33 (Berkeley) 5/19/91 * * @(#)cd9660_lookup.c 8.2 (Berkeley) 1/23/94 - * $Id: cd9660_lookup.c,v 1.16 1997/08/02 14:31:18 bde Exp $ + * $Id: cd9660_lookup.c,v 1.17 1997/08/26 07:32:30 phk Exp $ */ #include <sys/param.h> @@ -71,9 +71,6 @@ * * Overall outline of ufs_lookup: * - * check accessibility of directory - * look for name in cache, if found, then if at end of path - * and deleting or creating, drop it, else return name * search for name in directory, to found or notfound * notfound: * if creating, return locked directory, leaving info on available slots @@ -134,17 +131,6 @@ cd9660_lookup(ap) wantparent = flags & (LOCKPARENT|WANTPARENT); /* - * Check accessiblity of directory. - */ - if (vdp->v_type != VDIR) - return (ENOTDIR); - if (error = VOP_ACCESS(vdp, VEXEC, cred, cnp->cn_proc)) - return (error); - if ((flags & ISLASTCN) && (vdp->v_mount->mnt_flag & MNT_RDONLY) && - (cnp->cn_nameiop == DELETE || cnp->cn_nameiop == RENAME)) - return (EROFS); - - /* * We now have a segment name to search for, and a directory to search. */ |
