From: Matthew Dillon <dillon@dragonflybsd.org>
Date: Fri, 13 Aug 2004 02:59:29 +0000 (+0000)
Subject: Oops, undo portions of the last commit, some extra work got committed that
X-Git-Tag: v2.0.1~10533
X-Git-Url: https://gitweb.dragonflybsd.org/dragonfly.git/commitdiff_plain/75ac7a30872b3251fa57484e7a22333dba6c90f9

Oops, undo portions of the last commit, some extra work got committed that
isn't quite ready to go in yet.
---

diff --git a/sys/emulation/linux/i386/linprocfs/Makefile b/sys/emulation/linux/i386/linprocfs/Makefile
index 2cdf8d5105..d0b9136a68 100644
--- a/sys/emulation/linux/i386/linprocfs/Makefile
+++ b/sys/emulation/linux/i386/linprocfs/Makefile
@@ -1,9 +1,9 @@
 # $FreeBSD: src/sys/modules/linprocfs/Makefile,v 1.1.2.3 2000/06/06 11:53:28 des Exp $
-# $DragonFly: src/sys/emulation/linux/i386/linprocfs/Makefile,v 1.4 2004/08/13 02:50:58 dillon Exp $
+# $DragonFly: src/sys/emulation/linux/i386/linprocfs/Makefile,v 1.5 2004/08/13 02:59:29 dillon Exp $
 
 .PATH:	${.CURDIR}/../../../../emulation/linux/i386/linprocfs
 KMOD=	linprocfs
-SRCS=	linprocfs_misc.c linprocfs_subr.c \
+SRCS=	vnode_if.h linprocfs_misc.c linprocfs_subr.c \
 		linprocfs_vfsops.c linprocfs_vnops.c
 NOMAN=
 CFLAGS+= -DLINPROCFS
diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs.h b/sys/emulation/linux/i386/linprocfs/linprocfs.h
index 0ac063b577..f5b0dcd2a7 100644
--- a/sys/emulation/linux/i386/linprocfs/linprocfs.h
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs.h
@@ -39,7 +39,7 @@
  *	@(#)procfs.h	8.9 (Berkeley) 5/14/95
  *
  * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs.h,v 1.2.2.4 2001/06/25 19:46:47 pirzyk Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs.h,v 1.5 2004/08/13 02:50:58 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs.h,v 1.6 2004/08/13 02:59:29 dillon Exp $
  */
 
 /*
@@ -142,7 +142,7 @@ int linprocfs_validfile (struct proc *);
 #define PROCFS_LOCKED	0x01
 #define PROCFS_WANT	0x02
 
-extern struct vop_ops *linprocfs_vnode_vops;
+extern vop_t **linprocfs_vnodeop_p;
 
 int	linprocfs_root (struct mount *, struct vnode **);
 int	linprocfs_rw (struct vop_read_args *);
diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c b/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c
index 76bb150440..d64eecdc4e 100644
--- a/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c
@@ -39,7 +39,7 @@
  *	@(#)procfs_subr.c	8.6 (Berkeley) 5/14/95
  *
  * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_subr.c,v 1.3.2.4 2001/06/25 19:46:47 pirzyk Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c,v 1.8 2004/08/13 02:50:58 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_subr.c,v 1.9 2004/08/13 02:59:29 dillon Exp $
  */
 
 #include <sys/param.h>
@@ -124,7 +124,7 @@ loop:
 	 */
 	MALLOC(pfs, struct pfsnode *, sizeof(struct pfsnode), M_TEMP, M_WAITOK);
 
-	if ((error = getnewvnode(VT_PROCFS, mp, linprocfs_vnode_vops, vpp)) != 0) {
+	if ((error = getnewvnode(VT_PROCFS, mp, linprocfs_vnodeop_p, vpp)) != 0) {
 		FREE(pfs, M_TEMP);
 		goto out;
 	}
diff --git a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
index d1bf4c09e3..866d064c74 100644
--- a/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
+++ b/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c
@@ -39,7 +39,7 @@
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
  * $FreeBSD: src/sys/i386/linux/linprocfs/linprocfs_vnops.c,v 1.3.2.5 2001/08/12 14:29:19 rwatson Exp $
- * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.13 2004/08/13 02:50:58 dillon Exp $
+ * $DragonFly: src/sys/emulation/linux/i386/linprocfs/linprocfs_vnops.c,v 1.14 2004/08/13 02:59:29 dillon Exp $
  */
 
 /*
@@ -1017,37 +1017,37 @@ atopid(b, len)
 /*
  * procfs vnode operations.
  */
-struct vop_ops *linprocfs_vnode_vops;
+vop_t **linprocfs_vnodeop_p;
 static struct vnodeopv_entry_desc linprocfs_vnodeop_entries[] = {
-	{ &vop_default_desc,		vop_defaultop },
-	{ &vop_access_desc,		(void *) linprocfs_access },
-	{ &vop_advlock_desc,		(void *) linprocfs_badop },
-	{ &vop_bmap_desc,		(void *) linprocfs_bmap },
-	{ &vop_close_desc,		(void *) linprocfs_close },
-	{ &vop_create_desc,		(void *) linprocfs_badop },
-	{ &vop_getattr_desc,		(void *) linprocfs_getattr },
-	{ &vop_inactive_desc,		(void *) linprocfs_inactive },
-	{ &vop_link_desc,		(void *) linprocfs_badop },
-	{ &vop_lookup_desc,		(void *) linprocfs_lookup },
-	{ &vop_mkdir_desc,		(void *) linprocfs_badop },
-	{ &vop_mknod_desc,		(void *) linprocfs_badop },
-	{ &vop_open_desc,		(void *) linprocfs_open },
-	{ &vop_pathconf_desc,		(void *) vop_stdpathconf },
-	{ &vop_print_desc,		(void *) linprocfs_print },
-	{ &vop_read_desc,		(void *) linprocfs_rw },
-	{ &vop_readdir_desc,		(void *) linprocfs_readdir },
-	{ &vop_readlink_desc,		(void *) linprocfs_readlink },
-	{ &vop_reclaim_desc,		(void *) linprocfs_reclaim },
-	{ &vop_remove_desc,		(void *) linprocfs_badop },
-	{ &vop_rename_desc,		(void *) linprocfs_badop },
-	{ &vop_rmdir_desc,		(void *) linprocfs_badop },
-	{ &vop_setattr_desc,		(void *) linprocfs_setattr },
-	{ &vop_symlink_desc,		(void *) linprocfs_badop },
-	{ &vop_write_desc,		(void *) linprocfs_rw },
-	{ &vop_ioctl_desc,		(void *) linprocfs_ioctl },
+	{ &vop_default_desc,		(vop_t *) vop_defaultop },
+	{ &vop_access_desc,		(vop_t *) linprocfs_access },
+	{ &vop_advlock_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_bmap_desc,		(vop_t *) linprocfs_bmap },
+	{ &vop_close_desc,		(vop_t *) linprocfs_close },
+	{ &vop_create_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_getattr_desc,		(vop_t *) linprocfs_getattr },
+	{ &vop_inactive_desc,		(vop_t *) linprocfs_inactive },
+	{ &vop_link_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_lookup_desc,		(vop_t *) linprocfs_lookup },
+	{ &vop_mkdir_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_mknod_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_open_desc,		(vop_t *) linprocfs_open },
+	{ &vop_pathconf_desc,		(vop_t *) vop_stdpathconf },
+	{ &vop_print_desc,		(vop_t *) linprocfs_print },
+	{ &vop_read_desc,		(vop_t *) linprocfs_rw },
+	{ &vop_readdir_desc,		(vop_t *) linprocfs_readdir },
+	{ &vop_readlink_desc,		(vop_t *) linprocfs_readlink },
+	{ &vop_reclaim_desc,		(vop_t *) linprocfs_reclaim },
+	{ &vop_remove_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_rename_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_rmdir_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_setattr_desc,		(vop_t *) linprocfs_setattr },
+	{ &vop_symlink_desc,		(vop_t *) linprocfs_badop },
+	{ &vop_write_desc,		(vop_t *) linprocfs_rw },
+	{ &vop_ioctl_desc,		(vop_t *) linprocfs_ioctl },
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc linprocfs_vnodeop_opv_desc =
-	{ &linprocfs_vnode_vops, linprocfs_vnodeop_entries };
+	{ &linprocfs_vnodeop_p, linprocfs_vnodeop_entries };
 
 VNODEOP_SET(linprocfs_vnodeop_opv_desc);