From 4af3a70841ebf7433052fa7acf1c9541e4a3f9f1 Mon Sep 17 00:00:00 2001
From: natano <natano@openbsd.org>
Date: Wed, 10 Aug 2016 07:53:02 +0000
Subject: [PATCH] ext2fs only has one set of specops/fifoops ok mpi tedu

---
 sys/ufs/ext2fs/ext2fs_extern.h | 8 ++------
 sys/ufs/ext2fs/ext2fs_subr.c   | 9 ++++-----
 sys/ufs/ext2fs/ext2fs_vfsops.c | 4 ++--
 3 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/sys/ufs/ext2fs/ext2fs_extern.h b/sys/ufs/ext2fs/ext2fs_extern.h
index a8c41721c49..a0253a1470e 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.35 2014/07/14 08:54:13 pelikan Exp $	*/
+/*	$OpenBSD: ext2fs_extern.h,v 1.36 2016/08/10 07:53:02 natano Exp $	*/
 /*	$NetBSD: ext2fs_extern.h,v 1.1 1997/06/11 09:33:55 bouyer Exp $	*/
 
 /*-
@@ -91,8 +91,7 @@ int	ext2fs_checkpath(struct inode *, struct inode *, struct ucred *);
 
 /* ext2fs_subr.c */
 int	ext2fs_bufatoff(struct inode *, off_t, char **, struct buf **);
-int	ext2fs_vinit(struct mount *, struct vops *, struct vops *,
-	    struct vnode **);
+int	ext2fs_vinit(struct mount *, struct vnode **);
 #ifdef DIAGNOSTIC
 void	ext2fs_checkoverlap(struct buf *, struct inode *);
 #endif
@@ -149,7 +148,4 @@ extern struct vops ext2fs_vops;
 extern struct vops ext2fs_specvops;
 #ifdef FIFO
 extern struct vops ext2fs_fifovops;
-#define EXT2FS_FIFOOPS &ext2fs_fifovops
-#else
-#define EXT2FS_FIFOOPS NULL
 #endif
diff --git a/sys/ufs/ext2fs/ext2fs_subr.c b/sys/ufs/ext2fs/ext2fs_subr.c
index 6e036c5a130..d859d216b40 100644
--- a/sys/ufs/ext2fs/ext2fs_subr.c
+++ b/sys/ufs/ext2fs/ext2fs_subr.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_subr.c,v 1.34 2016/02/04 12:45:03 mikeb Exp $	*/
+/*	$OpenBSD: ext2fs_subr.c,v 1.35 2016/08/10 07:53:02 natano Exp $	*/
 /*	$NetBSD: ext2fs_subr.c,v 1.1 1997/06/11 09:34:03 bouyer Exp $	*/
 
 /*
@@ -145,8 +145,7 @@ ext2fs_checkoverlap(struct buf *bp, struct inode *ip)
  * Initialize the vnode associated with a new inode, handle aliased vnodes.
  */
 int
-ext2fs_vinit(struct mount *mp, struct vops *specops,
-    struct vops *fifoops, struct vnode **vpp)
+ext2fs_vinit(struct mount *mp, struct vnode **vpp)
 {
 	struct inode *ip;
 	struct vnode *vp, *nvp;
@@ -159,7 +158,7 @@ ext2fs_vinit(struct mount *mp, struct vops *specops,
 	switch(vp->v_type) {
 	case VCHR:
 	case VBLK:
-		vp->v_op = specops;
+		vp->v_op = &ext2fs_specvops;
 
 		nvp = checkalias(vp, letoh32(ip->i_e2din->e2di_rdev), mp);
 		if (nvp != NULL) {
@@ -185,7 +184,7 @@ ext2fs_vinit(struct mount *mp, struct vops *specops,
 
 	case VFIFO:
 #ifdef FIFO
-		vp->v_op = fifoops;
+		vp->v_op = &ext2fs_fifovops;
 		break;
 #else
 		return (EOPNOTSUPP);
diff --git a/sys/ufs/ext2fs/ext2fs_vfsops.c b/sys/ufs/ext2fs/ext2fs_vfsops.c
index 28755660bbe..1e2339cb21a 100644
--- a/sys/ufs/ext2fs/ext2fs_vfsops.c
+++ b/sys/ufs/ext2fs/ext2fs_vfsops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: ext2fs_vfsops.c,v 1.93 2016/06/19 11:54:33 natano Exp $	*/
+/*	$OpenBSD: ext2fs_vfsops.c,v 1.94 2016/08/10 07:53:02 natano Exp $	*/
 /*	$NetBSD: ext2fs_vfsops.c,v 1.1 1997/06/11 09:34:07 bouyer Exp $	*/
 
 /*
@@ -918,7 +918,7 @@ ext2fs_vget(struct mount *mp, ino_t ino, struct vnode **vpp)
 	 * Initialize the vnode from the inode, check for aliases.
 	 * Note that the underlying vnode may have changed.
 	 */
-	error = ext2fs_vinit(mp, &ext2fs_specvops, EXT2FS_FIFOOPS, &vp);
+	error = ext2fs_vinit(mp, &vp);
 	if (error) {
 		vput(vp);
 		*vpp = NULL;
-- 
2.20.1