From c7b0cb75249b0df0ca9bfb325be9fa4b8b6551a4 Mon Sep 17 00:00:00 2001
From: Constantine Sapuntzakis <csapuntz@cvs.openbsd.org>
Date: Sat, 23 Jun 2001 02:14:28 +0000
Subject: Get rid of several unused vnode operations

---
 sys/miscfs/deadfs/dead_vnops.c   | 16 +-------------
 sys/miscfs/fdesc/fdesc_vnops.c   | 23 +-------------------
 sys/miscfs/fifofs/fifo.h         |  9 +-------
 sys/miscfs/fifofs/fifo_vnops.c   |  9 +-------
 sys/miscfs/kernfs/kernfs_vnops.c |  9 +-------
 sys/miscfs/portal/portal_vnops.c | 25 +---------------------
 sys/miscfs/procfs/procfs_vnops.c | 16 +-------------
 sys/miscfs/specfs/spec_vnops.c   |  9 +-------
 sys/miscfs/specfs/specdev.h      |  9 +-------
 sys/miscfs/union/union_vnops.c   | 46 +---------------------------------------
 10 files changed, 10 insertions(+), 161 deletions(-)

(limited to 'sys/miscfs')

diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index 97e4fc3784e..fc5f2f4ecbf 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: dead_vnops.c,v 1.7 1998/11/13 00:31:25 art Exp $	*/
+/*	$OpenBSD: dead_vnops.c,v 1.8 2001/06/23 02:14:23 csapuntz Exp $	*/
 /*	$NetBSD: dead_vnops.c,v 1.16 1996/02/13 13:12:48 mycroft Exp $	*/
 
 /*
@@ -63,9 +63,7 @@ int	dead_read	__P((void *));
 int	dead_write	__P((void *));
 int	dead_ioctl	__P((void *));
 int	dead_select	__P((void *));
-#define dead_mmap	dead_badop
 #define dead_fsync	nullop
-#define dead_seek	nullop
 #define dead_remove	dead_badop
 #define dead_link	dead_badop
 #define dead_rename	dead_badop
@@ -85,11 +83,6 @@ int	dead_print	__P((void *));
 #define dead_islocked	vop_generic_islocked
 #define dead_pathconf	dead_ebadf
 #define dead_advlock	dead_ebadf
-#define dead_blkatoff	dead_badop
-#define dead_valloc	dead_badop
-#define dead_vfree	dead_badop
-#define dead_truncate	nullop
-#define dead_update	nullop
 #define dead_bwrite	nullop
 
 int	chkvnlock __P((struct vnode *));
@@ -110,9 +103,7 @@ struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_write_desc, dead_write },	/* write */
 	{ &vop_ioctl_desc, dead_ioctl },	/* ioctl */
 	{ &vop_select_desc, dead_select },	/* select */
-	{ &vop_mmap_desc, dead_mmap },		/* mmap */
 	{ &vop_fsync_desc, dead_fsync },	/* fsync */
-	{ &vop_seek_desc, dead_seek },		/* seek */
 	{ &vop_remove_desc, dead_remove },	/* remove */
 	{ &vop_link_desc, dead_link },		/* link */
 	{ &vop_rename_desc, dead_rename },	/* rename */
@@ -132,11 +123,6 @@ struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_islocked_desc, dead_islocked },	/* islocked */
 	{ &vop_pathconf_desc, dead_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, dead_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, dead_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, dead_valloc },	/* valloc */
-	{ &vop_vfree_desc, dead_vfree },	/* vfree */
-	{ &vop_truncate_desc, dead_truncate },	/* truncate */
-	{ &vop_update_desc, dead_update },	/* update */
 	{ &vop_bwrite_desc, dead_bwrite },	/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index 790eba983b9..69655c6f34d 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fdesc_vnops.c,v 1.22 2001/05/23 14:34:30 art Exp $	*/
+/*	$OpenBSD: fdesc_vnops.c,v 1.23 2001/06/23 02:14:24 csapuntz Exp $	*/
 /*	$NetBSD: fdesc_vnops.c,v 1.32 1996/04/11 11:24:29 mrg Exp $	*/
 
 /*
@@ -102,9 +102,7 @@ int	fdesc_read	__P((void *));
 int	fdesc_write	__P((void *));
 int	fdesc_ioctl	__P((void *));
 int	fdesc_select	__P((void *));
-#define	fdesc_mmap	eopnotsupp
 #define	fdesc_fsync	nullop
-#define	fdesc_seek	nullop
 #define	fdesc_remove	eopnotsupp
 #define fdesc_revoke    vop_generic_revoke
 int	fdesc_link	__P((void *));
@@ -124,11 +122,6 @@ int	fdesc_print	__P((void *));
 int	fdesc_pathconf	__P((void *));
 #define	fdesc_islocked	vop_generic_islocked
 #define	fdesc_advlock	eopnotsupp
-#define	fdesc_blkatoff	eopnotsupp
-#define	fdesc_valloc	eopnotsupp
-int	fdesc_vfree	__P((void *));
-#define	fdesc_truncate	eopnotsupp
-#define	fdesc_update	eopnotsupp
 #define	fdesc_bwrite	eopnotsupp
 
 int (**fdesc_vnodeop_p) __P((void *));
@@ -147,9 +140,7 @@ struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, fdesc_ioctl },	/* ioctl */
 	{ &vop_revoke_desc, fdesc_revoke },     /* revoke */
 	{ &vop_select_desc, fdesc_select },	/* select */
-	{ &vop_mmap_desc, fdesc_mmap },		/* mmap */
 	{ &vop_fsync_desc, fdesc_fsync },	/* fsync */
-	{ &vop_seek_desc, fdesc_seek },		/* seek */
 	{ &vop_remove_desc, fdesc_remove },	/* remove */
 	{ &vop_link_desc, fdesc_link },		/* link */
 	{ &vop_rename_desc, fdesc_rename },	/* rename */
@@ -169,11 +160,6 @@ struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_islocked_desc, fdesc_islocked },	/* islocked */
 	{ &vop_pathconf_desc, fdesc_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, fdesc_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, fdesc_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, fdesc_valloc },	/* valloc */
-	{ &vop_vfree_desc, fdesc_vfree },	/* vfree */
-	{ &vop_truncate_desc, fdesc_truncate },	/* truncate */
-	{ &vop_update_desc, fdesc_update },	/* update */
 	{ &vop_bwrite_desc, fdesc_bwrite },	/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -931,13 +917,6 @@ fdesc_print(v)
 	return (0);
 }
 
-int
-fdesc_vfree(v)
-	void *v;
-{
-	return (0);
-}
-
 int
 fdesc_link(v) 
 	void *v;
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index 8a5b96a1dbe..2e59d7076dd 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fifo.h,v 1.7 2001/03/01 20:54:34 provos Exp $	*/
+/*	$OpenBSD: fifo.h,v 1.8 2001/06/23 02:14:24 csapuntz Exp $	*/
 /*	$NetBSD: fifo.h,v 1.10 1996/02/09 22:40:15 christos Exp $	*/
 
 /*
@@ -57,9 +57,7 @@ int	fifo_write	__P((void *));
 int	fifo_ioctl	__P((void *));
 int	fifo_select	__P((void *));
 int	fifo_kqfilter	__P((void *));
-#define fifo_mmap	fifo_badop
 #define fifo_fsync	nullop
-#define fifo_seek	fifo_badop
 #define fifo_remove	fifo_badop
 #define fifo_revoke     vop_generic_revoke
 #define fifo_link	fifo_badop
@@ -80,12 +78,7 @@ int	fifo_print	__P((void *));
 #define fifo_islocked	vop_generic_islocked
 int	fifo_pathconf	__P((void *));
 int	fifo_advlock	__P((void *));
-#define fifo_blkatoff	fifo_badop
-#define fifo_valloc	fifo_badop
 #define fifo_reallocblks fifo_badop
-#define fifo_vfree	fifo_badop
-#define fifo_truncate	nullop
-#define fifo_update	nullop
 #define fifo_bwrite	nullop
 
 void 	fifo_printinfo __P((struct vnode *));
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 142aae7f6cf..d6672bfc6ef 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: fifo_vnops.c,v 1.9 2001/03/01 20:54:34 provos Exp $	*/
+/*	$OpenBSD: fifo_vnops.c,v 1.10 2001/06/23 02:14:24 csapuntz Exp $	*/
 /*	$NetBSD: fifo_vnops.c,v 1.18 1996/03/16 23:52:42 christos Exp $	*/
 
 /*
@@ -82,9 +82,7 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_select_desc, fifo_select },		/* select */
 	{ &vop_kqfilter_desc, fifo_kqfilter },		/* kqfilter */
 	{ &vop_revoke_desc, fifo_revoke },              /* revoke */
-	{ &vop_mmap_desc, fifo_mmap },			/* mmap */
 	{ &vop_fsync_desc, fifo_fsync },		/* fsync */
-	{ &vop_seek_desc, fifo_seek },			/* seek */
 	{ &vop_remove_desc, fifo_remove },		/* remove */
 	{ &vop_link_desc, fifo_link },			/* link */
 	{ &vop_rename_desc, fifo_rename },		/* rename */
@@ -104,11 +102,6 @@ struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_islocked_desc, fifo_islocked },		/* islocked */
 	{ &vop_pathconf_desc, fifo_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, fifo_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, fifo_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, fifo_valloc },		/* valloc */
-	{ &vop_vfree_desc, fifo_vfree },		/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },		/* truncate */
-	{ &vop_update_desc, fifo_update },		/* update */
 	{ &vop_bwrite_desc, fifo_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index 160e437ed0a..d09467aa019 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: kernfs_vnops.c,v 1.19 2000/03/13 04:05:15 millert Exp $	*/
+/*	$OpenBSD: kernfs_vnops.c,v 1.20 2001/06/23 02:14:25 csapuntz Exp $	*/
 /*	$NetBSD: kernfs_vnops.c,v 1.43 1996/03/16 23:52:47 christos Exp $	*/
 
 /*
@@ -189,9 +189,7 @@ struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, kernfs_ioctl },	/* ioctl */
 	{ &vop_select_desc, kernfs_select },	/* select */
 	{ &vop_revoke_desc, kernfs_revoke },    /* revoke */
-	{ &vop_mmap_desc, kernfs_mmap },	/* mmap */
 	{ &vop_fsync_desc, kernfs_fsync },	/* fsync */
-	{ &vop_seek_desc, kernfs_seek },	/* seek */
 	{ &vop_remove_desc, kernfs_remove },	/* remove */
 	{ &vop_link_desc, kernfs_link },	/* link */
 	{ &vop_rename_desc, kernfs_rename },	/* rename */
@@ -211,11 +209,6 @@ struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, kernfs_islocked },/* islocked */
 	{ &vop_pathconf_desc, kernfs_pathconf },/* pathconf */
 	{ &vop_advlock_desc, kernfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, kernfs_blkatoff },/* blkatoff */
-	{ &vop_valloc_desc, kernfs_valloc },	/* valloc */
-	{ &vop_vfree_desc, kernfs_vfree },	/* vfree */
-	{ &vop_truncate_desc, kernfs_truncate },/* truncate */
-	{ &vop_update_desc, kernfs_update },	/* update */
 	{ &vop_bwrite_desc, kernfs_bwrite },	/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 9dbce2338ff..9a08301852e 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: portal_vnops.c,v 1.8 1999/11/10 23:17:39 csapuntz Exp $	*/
+/*	$OpenBSD: portal_vnops.c,v 1.9 2001/06/23 02:14:25 csapuntz Exp $	*/
 /*	$NetBSD: portal_vnops.c,v 1.17 1996/02/13 13:12:57 mycroft Exp $	*/
 
 /*
@@ -85,9 +85,7 @@ int	portal_setattr	__P((void *));
 #define	portal_write	eopnotsupp
 #define	portal_ioctl    (int (*) __P((void *)))enoioctl
 #define	portal_select	eopnotsupp
-#define	portal_mmap	eopnotsupp
 #define	portal_fsync	nullop
-#define	portal_seek	nullop
 #define	portal_remove	eopnotsupp
 int	portal_link	__P((void *));
 #define	portal_rename	eopnotsupp
@@ -107,11 +105,6 @@ int	portal_print	__P((void *));
 #define	portal_islocked	vop_generic_islocked
 int	portal_pathconf	__P((void *));
 #define	portal_advlock	eopnotsupp
-#define	portal_blkatoff	eopnotsupp
-#define	portal_valloc	eopnotsupp
-int	portal_vfree	__P((void *));
-#define	portal_truncate	eopnotsupp
-#define	portal_update	eopnotsupp
 #define	portal_bwrite	eopnotsupp
 
 int (**portal_vnodeop_p) __P((void *));
@@ -130,9 +123,7 @@ struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_ioctl_desc, portal_ioctl },		/* ioctl */
 	{ &vop_select_desc, portal_select },		/* select */
 	{ &vop_revoke_desc, portal_revoke },            /* revoke */
-	{ &vop_mmap_desc, portal_mmap },		/* mmap */
 	{ &vop_fsync_desc, portal_fsync },		/* fsync */
-	{ &vop_seek_desc, portal_seek },		/* seek */
 	{ &vop_remove_desc, portal_remove },		/* remove */
 	{ &vop_link_desc, portal_link },		/* link */
 	{ &vop_rename_desc, portal_rename },		/* rename */
@@ -152,11 +143,6 @@ struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_islocked_desc, portal_islocked },	/* islocked */
 	{ &vop_pathconf_desc, portal_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, portal_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, portal_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, portal_valloc },		/* valloc */
-	{ &vop_vfree_desc, portal_vfree },		/* vfree */
-	{ &vop_truncate_desc, portal_truncate },	/* truncate */
-	{ &vop_update_desc, portal_update },		/* update */
 	{ &vop_bwrite_desc, portal_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -686,15 +672,6 @@ portal_print(v)
 	return (0);
 }
 
-/* ARGSUSED */
-int
-portal_vfree(v)
-	void *v;
-{
-
-	return (0);
-}
-
 int
 portal_link(v) 
 	void *v;
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index 5fbf6096f28..dcb5f794428 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: procfs_vnops.c,v 1.18 2001/05/24 07:32:43 aaron Exp $	*/
+/*	$OpenBSD: procfs_vnops.c,v 1.19 2001/06/23 02:14:25 csapuntz Exp $	*/
 /*	$NetBSD: procfs_vnops.c,v 1.40 1996/03/16 23:52:55 christos Exp $	*/
 
 /*
@@ -134,9 +134,7 @@ int	procfs_setattr	__P((void *));
 #define	procfs_write	procfs_rw
 int	procfs_ioctl	__P((void *));
 #define	procfs_select	procfs_badop
-#define	procfs_mmap	procfs_badop
 #define	procfs_fsync	procfs_badop
-#define	procfs_seek	procfs_badop
 #define	procfs_remove	procfs_badop
 int	procfs_link	__P((void *));
 #define	procfs_rename	procfs_badop
@@ -155,11 +153,6 @@ int	procfs_print	__P((void *));
 int	procfs_pathconf	__P((void *));
 #define	procfs_islocked	nullop
 #define	procfs_advlock	procfs_badop
-#define	procfs_blkatoff	procfs_badop
-#define	procfs_valloc	procfs_badop
-#define	procfs_vfree	nullop
-#define	procfs_truncate	procfs_badop
-#define	procfs_update	nullop
 
 static pid_t atopid __P((const char *, u_int));
 
@@ -181,9 +174,7 @@ struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_write_desc, procfs_write },		/* write */
 	{ &vop_ioctl_desc, procfs_ioctl },		/* ioctl */
 	{ &vop_select_desc, procfs_select },		/* select */
-	{ &vop_mmap_desc, procfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, procfs_fsync },		/* fsync */
-	{ &vop_seek_desc, procfs_seek },		/* seek */
 	{ &vop_remove_desc, procfs_remove },		/* remove */
 	{ &vop_link_desc, procfs_link },		/* link */
 	{ &vop_rename_desc, procfs_rename },		/* rename */
@@ -203,11 +194,6 @@ struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, procfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, procfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, procfs_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, procfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, procfs_valloc },		/* valloc */
-	{ &vop_vfree_desc, procfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, procfs_truncate },	/* truncate */
-	{ &vop_update_desc, procfs_update },		/* update */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
 struct vnodeopv_desc procfs_vnodeop_opv_desc =
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 42b03423d98..219572773e6 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: spec_vnops.c,v 1.19 2001/03/15 16:44:15 csapuntz Exp $	*/
+/*	$OpenBSD: spec_vnops.c,v 1.20 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: spec_vnops.c,v 1.29 1996/04/22 01:42:38 christos Exp $	*/
 
 /*
@@ -83,9 +83,7 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_select_desc, spec_select },		/* select */
 	{ &vop_kqfilter_desc, spec_kqfilter },		/* kqfilter */
 	{ &vop_revoke_desc, spec_revoke },              /* revoke */
-	{ &vop_mmap_desc, spec_mmap },			/* mmap */
 	{ &vop_fsync_desc, spec_fsync },		/* fsync */
-	{ &vop_seek_desc, spec_seek },			/* seek */
 	{ &vop_remove_desc, spec_remove },		/* remove */
 	{ &vop_link_desc, spec_link },			/* link */
 	{ &vop_rename_desc, spec_rename },		/* rename */
@@ -105,11 +103,6 @@ struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_islocked_desc, spec_islocked },		/* islocked */
 	{ &vop_pathconf_desc, spec_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, spec_advlock },		/* advlock */
-	{ &vop_blkatoff_desc, spec_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, spec_valloc },		/* valloc */
-	{ &vop_vfree_desc, spec_vfree },		/* vfree */
-	{ &vop_truncate_desc, spec_truncate },		/* truncate */
-	{ &vop_update_desc, spec_update },		/* update */
 	{ &vop_bwrite_desc, spec_bwrite },		/* bwrite */
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index ea0eea0c841..7f4ab6fdecd 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: specdev.h,v 1.9 2001/03/01 20:54:35 provos Exp $	*/
+/*	$OpenBSD: specdev.h,v 1.10 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: specdev.h,v 1.12 1996/02/13 13:13:01 mycroft Exp $	*/
 
 /*
@@ -98,9 +98,7 @@ int	spec_write	__P((void *));
 int	spec_ioctl	__P((void *));
 int	spec_select	__P((void *));
 int	spec_kqfilter	__P((void *));
-#define	spec_mmap	spec_badop
 int	spec_fsync	__P((void *));
-#define	spec_seek	spec_badop
 #define	spec_remove	spec_badop
 #define	spec_link	spec_badop
 #define	spec_rename	spec_badop
@@ -120,11 +118,6 @@ int	spec_strategy	__P((void *));
 int	spec_print	__P((void *));
 int	spec_pathconf	__P((void *));
 int	spec_advlock	__P((void *));
-#define	spec_blkatoff	spec_badop
-#define	spec_valloc	spec_badop
 #define	spec_reallocblks spec_badop
-#define	spec_vfree	spec_badop
-#define	spec_truncate	nullop
-#define	spec_update	nullop
 #define	spec_bwrite	vop_generic_bwrite
 #define spec_revoke     vop_generic_revoke
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index db903835be2..240c1b70c44 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: union_vnops.c,v 1.12 1998/08/18 07:08:29 deraadt Exp $	*/
+/*	$OpenBSD: union_vnops.c,v 1.13 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: union_vnops.c,v 1.30.4.1 1996/05/25 22:10:14 jtc Exp $	*/
 
 /*
@@ -73,9 +73,7 @@ int union_write		__P((void *));
 int union_lease		__P((void *));
 int union_ioctl		__P((void *));
 int union_select	__P((void *));
-int union_mmap		__P((void *));
 int union_fsync		__P((void *));
-int union_seek		__P((void *));
 int union_remove	__P((void *));
 int union_link		__P((void *));
 int union_rename	__P((void *));
@@ -114,9 +112,7 @@ struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_lease_desc, union_lease },		/* lease */
 	{ &vop_ioctl_desc, union_ioctl },		/* ioctl */
 	{ &vop_select_desc, union_select },		/* select */
-	{ &vop_mmap_desc, union_mmap },			/* mmap */
 	{ &vop_fsync_desc, union_fsync },		/* fsync */
-	{ &vop_seek_desc, union_seek },			/* seek */
 	{ &vop_remove_desc, union_remove },		/* remove */
 	{ &vop_link_desc, union_link },			/* link */
 	{ &vop_rename_desc, union_rename },		/* rename */
@@ -137,14 +133,6 @@ struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_islocked_desc, union_islocked },		/* islocked */
 	{ &vop_pathconf_desc, union_pathconf },		/* pathconf */
 	{ &vop_advlock_desc, union_advlock },		/* advlock */
-#ifdef notdef
-	{ &vop_blkatoff_desc, union_blkatoff },		/* blkatoff */
-	{ &vop_valloc_desc, union_valloc },		/* valloc */
-	{ &vop_vfree_desc, union_vfree },		/* vfree */
-	{ &vop_truncate_desc, union_truncate },		/* truncate */
-	{ &vop_update_desc, union_update },		/* update */
-	{ &vop_bwrite_desc, union_bwrite },		/* bwrite */
-#endif
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
 struct vnodeopv_desc union_vnodeop_opv_desc =
@@ -1011,22 +999,6 @@ union_select(v)
 	return (VCALL(vp, VOFFSET(vop_select), ap));
 }
 
-int
-union_mmap(v)
-	void *v;
-{
-	struct vop_mmap_args /* {
-		struct vnode *a_vp;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap = v;
-	register struct vnode *vp = OTHERVP(ap->a_vp);
-
-	ap->a_vp = vp;
-	return (VCALL(vp, VOFFSET(vop_mmap), ap));
-}
-
 int
 union_fsync(v)
 	void *v;
@@ -1057,22 +1029,6 @@ union_fsync(v)
 	return (error);
 }
 
-int
-union_seek(v)
-	void *v;
-{
-	struct vop_seek_args /* {
-		struct vnode *a_vp;
-		off_t  a_oldoff;
-		off_t  a_newoff;
-		struct ucred *a_cred;
-	} */ *ap = v;
-	register struct vnode *vp = OTHERVP(ap->a_vp);
-
-	ap->a_vp = vp;
-	return (VCALL(vp, VOFFSET(vop_seek), ap));
-}
-
 /* a_dvp: directory in which to link
    a_vp: new target of the link
    a_cnp: name for the link
-- 
cgit v1.2.3