diff options
| author | Eivind Eklund <eivind@FreeBSD.org> | 1999-12-15 23:02:35 +0000 |
|---|---|---|
| committer | Eivind Eklund <eivind@FreeBSD.org> | 1999-12-15 23:02:35 +0000 |
| commit | 762e6b856c64ee48f286a7f0b45d0067e556b252 (patch) | |
| tree | cf4d02d65f6e44871147fef3ce69de82368a30e5 /sys/isofs | |
| parent | 0b994c2e87a9de9d7eb48152a943ca4c21a4f788 (diff) | |
| download | src-762e6b856c64ee48f286a7f0b45d0067e556b252.tar.gz src-762e6b856c64ee48f286a7f0b45d0067e556b252.zip | |
Introduce NDFREE (and remove VOP_ABORTOP)
Notes
Notes:
svn path=/head/; revision=54655
Diffstat (limited to 'sys/isofs')
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vfsops.c | 3 | ||||
| -rw-r--r-- | sys/isofs/cd9660/cd9660_vnops.c | 18 |
2 files changed, 3 insertions, 18 deletions
diff --git a/sys/isofs/cd9660/cd9660_vfsops.c b/sys/isofs/cd9660/cd9660_vfsops.c index 8702879a79d9..3ecdb0637b75 100644 --- a/sys/isofs/cd9660/cd9660_vfsops.c +++ b/sys/isofs/cd9660/cd9660_vfsops.c @@ -54,6 +54,8 @@ #include <sys/stat.h> #include <sys/syslog.h> +#include <vm/vm_zone.h> + #include <isofs/cd9660/iso.h> #include <isofs/cd9660/iso_rrip.h> #include <isofs/cd9660/cd9660_node.h> @@ -209,6 +211,7 @@ cd9660_mount(mp, path, data, ndp, p) NDINIT(ndp, LOOKUP, FOLLOW, UIO_USERSPACE, args.fspec, p); if ((error = namei(ndp))) return (error); + NDFREE(ndp, NDF_ONLY_PNBUF); devvp = ndp->ni_vp; if (!vn_isdisk(devvp)) { diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c index 2f93731b1d4e..65ad9385e36c 100644 --- a/sys/isofs/cd9660/cd9660_vnops.c +++ b/sys/isofs/cd9660/cd9660_vnops.c @@ -73,7 +73,6 @@ static int iso_uiodir __P((struct isoreaddir *idp, struct dirent *dp, static int iso_shipdir __P((struct isoreaddir *idp)); static int cd9660_readdir __P((struct vop_readdir_args *)); static int cd9660_readlink __P((struct vop_readlink_args *ap)); -static int cd9660_abortop __P((struct vop_abortop_args *)); static int cd9660_strategy __P((struct vop_strategy_args *)); static int cd9660_print __P((struct vop_print_args *)); static int cd9660_getpages __P((struct vop_getpages_args *)); @@ -737,22 +736,6 @@ cd9660_readlink(ap) } /* - * Ufs abort op, called after namei() when a CREATE/DELETE isn't actually - * done. If a buffer has been saved in anticipation of a CREATE, delete it. - */ -static int -cd9660_abortop(ap) - struct vop_abortop_args /* { - struct vnode *a_dvp; - struct componentname *a_cnp; - } */ *ap; -{ - if ((ap->a_cnp->cn_flags & (HASBUF | SAVESTART)) == HASBUF) - zfree(namei_zone, ap->a_cnp->cn_pnbuf); - return (0); -} - -/* * Calculate the logical to physical mapping if not done already, * then call the device strategy routine. */ @@ -880,7 +863,6 @@ cd9660_putpages(ap) vop_t **cd9660_vnodeop_p; static struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = { { &vop_default_desc, (vop_t *) vop_defaultop }, - { &vop_abortop_desc, (vop_t *) cd9660_abortop }, { &vop_access_desc, (vop_t *) cd9660_access }, { &vop_bmap_desc, (vop_t *) cd9660_bmap }, { &vop_cachedlookup_desc, (vop_t *) cd9660_lookup }, |