summaryrefslogtreecommitdiff
path: root/sys/ufs/ext2fs
diff options
context:
space:
mode:
authorTed Unangst <tedu@cvs.openbsd.org>2003-07-06 09:07:19 +0000
committerTed Unangst <tedu@cvs.openbsd.org>2003-07-06 09:07:19 +0000
commit6b82ed4b44889425aa6d829891aa0a225f25df4d (patch)
treed3cb7c409c03d3bbd75424dbd2cba49066e27903 /sys/ufs/ext2fs
parentfecd0955cb78a1252f2c567e8b13c46a22282efb (diff)
remove ext2fs_vinit. it wasn't used and is identical to ufs_vinit.
otto made the diff for me, thanks.
Diffstat (limited to 'sys/ufs/ext2fs')
-rw-r--r--sys/ufs/ext2fs/ext2fs_extern.h4
-rw-r--r--sys/ufs/ext2fs/ext2fs_vnops.c69
2 files changed, 2 insertions, 71 deletions
diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h
index 9298d7d9205..fd20eac8e05 100644
--- a/sys/ufs/ext2fs/ext2fs_extern.h
+++ b/sys/ufs/ext2fs/ext2fs_extern.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_extern.h,v 1.17 2003/06/02 23:28:22 millert Exp $ */
+/* $OpenBSD: ext2fs_extern.h,v 1.18 2003/07/06 09:07:18 tedu Exp $ */
/* $NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $ */
/*-
@@ -136,8 +136,6 @@ int ext2fs_rmdir(void *);
int ext2fs_symlink(void *);
int ext2fs_readlink(void *);
int ext2fs_advlock(void *);
-int ext2fs_vinit(struct mount *, int (**specops)(void *),
- int (**fifoops)(void *), struct vnode **);
int ext2fs_makeinode(int, struct vnode *, struct vnode **,
struct componentname *cnp);
int ext2fs_fsync(void *);
diff --git a/sys/ufs/ext2fs/ext2fs_vnops.c b/sys/ufs/ext2fs/ext2fs_vnops.c
index f509be49d47..3cd627fa89e 100644
--- a/sys/ufs/ext2fs/ext2fs_vnops.c
+++ b/sys/ufs/ext2fs/ext2fs_vnops.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ext2fs_vnops.c,v 1.26 2003/06/02 23:28:22 millert Exp $ */
+/* $OpenBSD: ext2fs_vnops.c,v 1.27 2003/07/06 09:07:18 tedu Exp $ */
/* $NetBSD: ext2fs_vnops.c,v 1.1 1997/06/11 09:34:09 bouyer Exp $ */
/*
@@ -1235,73 +1235,6 @@ ext2fs_advlock(v)
}
/*
- * Initialize the vnode associated with a new inode, handle aliased
- * vnodes.
- */
-int
-ext2fs_vinit(mntp, specops, fifoops, vpp)
- struct mount *mntp;
- int (**specops)(void *);
- int (**fifoops)(void *);
- struct vnode **vpp;
-{
- struct inode *ip;
- struct vnode *vp, *nvp;
- struct proc *p = curproc;
-
- vp = *vpp;
- ip = VTOI(vp);
- switch(vp->v_type = IFTOVT(ip->i_e2fs_mode)) {
- case VCHR:
- case VBLK:
- vp->v_op = specops;
- if ((nvp = checkalias(vp, ip->i_din.e2fs_din.e2di_rdev, mntp))
- != NULL) {
- /*
- * Discard unneeded vnode, but save its inode.
- */
- ufs_ihashrem(ip);
- VOP_UNLOCK(vp, 0, p);
- nvp->v_data = vp->v_data;
- vp->v_data = NULL;
- vp->v_op = spec_vnodeop_p;
- vrele(vp);
- vgone(vp);
- /*
- * Reinitialize aliased inode.
- */
- vp = nvp;
- ip->i_vnode = vp;
- ufs_ihashins(ip);
- }
- break;
- case VFIFO:
-#ifdef FIFO
- vp->v_op = fifoops;
- break;
-#else
- return (EOPNOTSUPP);
-#endif
- case VNON:
- case VBAD:
- case VSOCK:
- case VLNK:
- case VDIR:
- case VREG:
- break;
- }
- if (ip->i_number == ROOTINO)
- vp->v_flag |= VROOT;
- /*
- * Initialize modrev times
- */
- SETHIGH(ip->i_modrev, mono_time.tv_sec);
- SETLOW(ip->i_modrev, mono_time.tv_usec * 4294);
- *vpp = vp;
- return (0);
-}
-
-/*
* Allocate a new inode.
*/
int