From 19024ae2fb76cb5ba44fa5c7212e67975d382c45 Mon Sep 17 00:00:00 2001
From: thorpej <thorpej@NetBSD.org>
Date: Wed, 18 Feb 1998 07:18:21 +0000
Subject: [PATCH] Don't vfs_opv_init_*(); this is properly handed by
 vfs_attach().

---
 sys/lkm/vfs/adosfs/lkminit_vfs.c        | 10 +---------
 sys/lkm/vfs/isofs/cd9660/lkminit_vfs.c  | 10 +---------
 sys/lkm/vfs/miscfs/fdesc/lkminit_vfs.c  | 10 +---------
 sys/lkm/vfs/miscfs/kernfs/lkminit_vfs.c | 10 +---------
 sys/lkm/vfs/miscfs/nullfs/lkminit_vfs.c | 10 +---------
 sys/lkm/vfs/miscfs/portal/lkminit_vfs.c | 10 +---------
 sys/lkm/vfs/miscfs/procfs/lkminit_vfs.c | 10 +---------
 sys/lkm/vfs/miscfs/umapfs/lkminit_vfs.c | 10 +---------
 sys/lkm/vfs/miscfs/union/lkminit_vfs.c  | 10 +---------
 sys/lkm/vfs/msdosfs/lkminit_vfs.c       | 10 +---------
 sys/lkm/vfs/ufs/ffs/lkminit_vfs.c       | 10 +---------
 sys/lkm/vfs/ufs/lfs/lkminit_lfs.c       | 10 +---------
 sys/lkm/vfs/ufs/mfs/lkminit_vfs.c       | 10 +---------
 13 files changed, 13 insertions(+), 117 deletions(-)

diff --git a/sys/lkm/vfs/adosfs/lkminit_vfs.c b/sys/lkm/vfs/adosfs/lkminit_vfs.c
index 9947c33cd4f6..f16759a1b71c 100644
--- a/sys/lkm/vfs/adosfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/adosfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.1 1997/07/08 16:44:49 veego Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.2 1998/02/18 07:18:21 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops adosfs_vfsops;
-extern struct vnodeopv_desc adosfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ adosfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&adosfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&adosfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/isofs/cd9660/lkminit_vfs.c b/sys/lkm/vfs/isofs/cd9660/lkminit_vfs.c
index dfb6e4fee1f4..cb5550e12838 100644
--- a/sys/lkm/vfs/isofs/cd9660/lkminit_vfs.c
+++ b/sys/lkm/vfs/isofs/cd9660/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:32 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:21 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops cd9660_vfsops;
-extern struct vnodeopv_desc cd9660_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ cd9660_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&cd9660_vnodeop_opv_desc);
-	vfs_opv_init_default(&cd9660_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/fdesc/lkminit_vfs.c b/sys/lkm/vfs/miscfs/fdesc/lkminit_vfs.c
index ace8542afa6e..8df53323819f 100644
--- a/sys/lkm/vfs/miscfs/fdesc/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/fdesc/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:33 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:21 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops fdesc_vfsops;
-extern struct vnodeopv_desc fdesc_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ fdesc_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&fdesc_vnodeop_opv_desc);
-	vfs_opv_init_default(&fdesc_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/kernfs/lkminit_vfs.c b/sys/lkm/vfs/miscfs/kernfs/lkminit_vfs.c
index b01827f53de0..81cd15070839 100644
--- a/sys/lkm/vfs/miscfs/kernfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/kernfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:34 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:22 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops kernfs_vfsops;
-extern struct vnodeopv_desc kernfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ kernfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&kernfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&kernfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/nullfs/lkminit_vfs.c b/sys/lkm/vfs/miscfs/nullfs/lkminit_vfs.c
index 0157cb6e61ac..fe05b65f702f 100644
--- a/sys/lkm/vfs/miscfs/nullfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/nullfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.3 1997/10/21 16:16:02 is Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.4 1998/02/18 07:18:22 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops nullfs_vfsops;
-extern struct vnodeopv_desc nullfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ nullfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&nullfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&nullfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/portal/lkminit_vfs.c b/sys/lkm/vfs/miscfs/portal/lkminit_vfs.c
index 152d928b74d8..48afc376c501 100644
--- a/sys/lkm/vfs/miscfs/portal/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/portal/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:37 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:22 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops portal_vfsops;
-extern struct vnodeopv_desc portal_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ portal_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&portal_vnodeop_opv_desc);
-	vfs_opv_init_default(&portal_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/procfs/lkminit_vfs.c b/sys/lkm/vfs/miscfs/procfs/lkminit_vfs.c
index ba15ee04cd25..74e302af2189 100644
--- a/sys/lkm/vfs/miscfs/procfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/procfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:38 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:22 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops procfs_vfsops;
-extern struct vnodeopv_desc procfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ procfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&procfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&procfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/umapfs/lkminit_vfs.c b/sys/lkm/vfs/miscfs/umapfs/lkminit_vfs.c
index 927c447374fc..36651476f03e 100644
--- a/sys/lkm/vfs/miscfs/umapfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/umapfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.3 1997/10/21 16:16:23 is Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.4 1998/02/18 07:18:22 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops umapfs_vfsops;
-extern struct vnodeopv_desc umapfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ umapfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&umapfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&umapfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/miscfs/union/lkminit_vfs.c b/sys/lkm/vfs/miscfs/union/lkminit_vfs.c
index 656e8808652a..dcf1bd054b1a 100644
--- a/sys/lkm/vfs/miscfs/union/lkminit_vfs.c
+++ b/sys/lkm/vfs/miscfs/union/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:41 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:22 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops union_vfsops;
-extern struct vnodeopv_desc union_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ union_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&union_vnodeop_opv_desc);
-	vfs_opv_init_default(&union_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/msdosfs/lkminit_vfs.c b/sys/lkm/vfs/msdosfs/lkminit_vfs.c
index 8954a2ee13b8..563517121ce8 100644
--- a/sys/lkm/vfs/msdosfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/msdosfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:42 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:23 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops msdosfs_vfsops;
-extern struct vnodeopv_desc msdosfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ msdosfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&msdosfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&msdosfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/ufs/ffs/lkminit_vfs.c b/sys/lkm/vfs/ufs/ffs/lkminit_vfs.c
index 8d0ddc16aacb..21d24ff5402b 100644
--- a/sys/lkm/vfs/ufs/ffs/lkminit_vfs.c
+++ b/sys/lkm/vfs/ufs/ffs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:43 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:23 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops ffs_vfsops;
-extern struct vnodeopv_desc ffs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ ffs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&ffs_vnodeop_opv_desc);
-	vfs_opv_init_default(&ffs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/ufs/lfs/lkminit_lfs.c b/sys/lkm/vfs/ufs/lfs/lkminit_lfs.c
index 1561709e50d3..1624b1c4467d 100644
--- a/sys/lkm/vfs/ufs/lfs/lkminit_lfs.c
+++ b/sys/lkm/vfs/ufs/lfs/lkminit_lfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_lfs.c,v 1.2 1997/05/19 23:26:44 jtc Exp $ */
+/* $NetBSD: lkminit_lfs.c,v 1.3 1998/02/18 07:18:23 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops lfs_vfsops;
-extern struct vnodeopv_desc lfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ lfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&lfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&lfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }
diff --git a/sys/lkm/vfs/ufs/mfs/lkminit_vfs.c b/sys/lkm/vfs/ufs/mfs/lkminit_vfs.c
index 6c27e0261e2c..c25786c34f88 100644
--- a/sys/lkm/vfs/ufs/mfs/lkminit_vfs.c
+++ b/sys/lkm/vfs/ufs/mfs/lkminit_vfs.c
@@ -1,4 +1,4 @@
-/* $NetBSD: lkminit_vfs.c,v 1.2 1997/05/19 23:26:45 jtc Exp $ */
+/* $NetBSD: lkminit_vfs.c,v 1.3 1998/02/18 07:18:23 thorpej Exp $ */
 
 /*-
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
@@ -50,7 +50,6 @@
  * This is the vfsops table for the file system in question
  */
 extern struct vfsops mfs_vfsops;
-extern struct vnodeopv_desc mfs_vnodeop_opv_desc;
 
 /*
  * declare the filesystem
@@ -66,13 +65,6 @@ mfs_lkmentry(lkmtp, cmd, ver)
 	int cmd;
 	int ver;
 {
-	/*
-	 * This is normally done automatically at boot time if the
-	 * opv_desc is listed in vfs_opv_descs[] in vfs_conf.c.  For
-	 * loaded modules, we have to do it manually.
-	 */
-	vfs_opv_init_explicit(&mfs_vnodeop_opv_desc);
-	vfs_opv_init_default(&mfs_vnodeop_opv_desc);
 
 	DISPATCH(lkmtp, cmd, ver, lkm_nofunc, lkm_nofunc, lkm_nofunc)
 }