diff options
Diffstat (limited to 'sys/kern')
| -rw-r--r-- | sys/kern/vfs_cache.c | 5 | ||||
| -rw-r--r-- | sys/kern/vfs_init.c | 15 | ||||
| -rw-r--r-- | sys/kern/vnode_if.src | 42 |
3 files changed, 6 insertions, 56 deletions
diff --git a/sys/kern/vfs_cache.c b/sys/kern/vfs_cache.c index 49cd2f3..3d76d4f 100644 --- a/sys/kern/vfs_cache.c +++ b/sys/kern/vfs_cache.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * @(#)vfs_cache.c 8.5 (Berkeley) 3/22/95 - * $Id: vfs_cache.c,v 1.33 1997/09/24 15:54:10 phk Exp $ + * $Id: vfs_cache.c,v 1.34 1997/10/15 13:22:52 phk Exp $ */ #include <sys/param.h> @@ -450,6 +450,5 @@ vfs_cache_lookup(ap) error = vn_lock(pdp, LK_EXCLUSIVE, p); if (error) return (error); - return (VCALL(vdp, VOFFSET(vop_cachedlookup), - (struct vop_cachedlookup_args *)ap)); + return (VOP_CACHEDLOOKUP(ap->a_dvp, ap->a_vpp, ap->a_cnp)); } diff --git a/sys/kern/vfs_init.c b/sys/kern/vfs_init.c index 03bd9a6..febde5e 100644 --- a/sys/kern/vfs_init.c +++ b/sys/kern/vfs_init.c @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)vfs_init.c 8.3 (Berkeley) 1/4/94 - * $Id: vfs_init.c,v 1.28 1997/09/21 04:22:59 dyson Exp $ + * $Id: vfs_init.c,v 1.29 1997/10/12 20:24:24 phk Exp $ */ @@ -80,17 +80,6 @@ extern struct vnodeop_desc *vfs_op_descs[]; struct vm_zone *namei_zone; /* - * A miscellaneous routine. - * A generic "default" routine that just returns an error. - */ -int -vn_default_error() -{ - - return (EOPNOTSUPP); -} - -/* * vfs_init.c * * Allocate and fill in operations vectors. @@ -283,6 +272,8 @@ vfsinit(dummy) /* * This goop is here to support a loadable NFS module... grumble... + * + * XXX: NFS could plug this into default_vnodeop_p now! */ int (*lease_check_hook) __P((struct vop_lease_args *)) = 0; diff --git a/sys/kern/vnode_if.src b/sys/kern/vnode_if.src index f22908c..c91c9f3 100644 --- a/sys/kern/vnode_if.src +++ b/sys/kern/vnode_if.src @@ -31,7 +31,7 @@ # SUCH DAMAGE. # # @(#)vnode_if.src 8.12 (Berkeley) 5/14/95 -# $Id: vnode_if.src,v 1.12 1997/08/25 20:28:49 phk Exp $ +# $Id: vnode_if.src,v 1.13 1997/09/14 02:35:25 peter Exp $ # # @@ -440,26 +440,6 @@ vop_advlock { }; # -#% blkatoff vp L L L -# -vop_blkatoff { - IN struct vnode *vp; - IN off_t offset; - OUT char **res; - OUT struct buf **bpp; -}; - -# -#% valloc pvp L L L -# -vop_valloc { - IN struct vnode *pvp; - IN int mode; - IN struct ucred *cred; - OUT struct vnode **vpp; -}; - -# #% reallocblks vp L L L # vop_reallocblks { @@ -468,26 +448,6 @@ vop_reallocblks { }; # -#% vfree pvp L L L -# -vop_vfree { - IN struct vnode *pvp; - IN ino_t ino; - IN int mode; -}; - -# -#% truncate vp L L L -# -vop_truncate { - IN struct vnode *vp; - IN off_t length; - IN int flags; - IN struct ucred *cred; - IN struct proc *p; -}; - -# #% update vp L L L # vop_update { |
