Get rid of several unused vnode operations

2 files changed, 2 insertions, 152 deletions

diff --git a/sys/nfs/nfs_vnops.c b/sys/nfs/nfs_vnops.c
index 5b51ee31418..563eec090f6 100644
--- a/sys/nfs/nfs_vnops.c
+++ b/sys/nfs/nfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfs_vnops.c,v 1.30 2001/06/05 21:56:14 provos Exp $	*/
+/*	$OpenBSD: nfs_vnops.c,v 1.31 2001/06/23 02:14:26 csapuntz Exp $	*/
 /*	$NetBSD: nfs_vnops.c,v 1.62.4.1 1996/07/08 20:26:52 jtc Exp $	*/
 
 /*
@@ -105,9 +105,7 @@ struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
 	{ &vop_select_desc, nfs_select },	/* select */
 	{ &vop_kqfilter_desc, vop_generic_kqfilter },	/* kqfilter */
 	{ &vop_revoke_desc, nfs_revoke },	/* revoke */
-	{ &vop_mmap_desc, nfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, nfs_fsync },		/* fsync */
-	{ &vop_seek_desc, nfs_seek },		/* seek */
 	{ &vop_remove_desc, nfs_remove },	/* remove */
 	{ &vop_link_desc, nfs_link },		/* link */
 	{ &vop_rename_desc, nfs_rename },	/* rename */
@@ -127,12 +125,7 @@ struct vnodeopv_entry_desc nfsv2_vnodeop_entries[] = {
 	{ &vop_islocked_desc, nfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, nfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, nfs_advlock },	/* advlock */
-	{ &vop_blkatoff_desc, nfs_blkatoff },	/* blkatoff */
-	{ &vop_valloc_desc, nfs_valloc },	/* valloc */
 	{ &vop_reallocblks_desc, nfs_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, nfs_vfree },		/* vfree */
-	{ &vop_truncate_desc, nfs_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
 	{ &vop_bwrite_desc, nfs_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -159,9 +152,7 @@ struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
 	{ &vop_ioctl_desc, spec_ioctl },	/* ioctl */
 	{ &vop_select_desc, spec_select },	/* select */
 	{ &vop_revoke_desc, spec_revoke },	/* revoke */
-	{ &vop_mmap_desc, spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, nfs_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 */
@@ -181,12 +172,7 @@ struct vnodeopv_entry_desc spec_nfsv2nodeop_entries[] = {
 	{ &vop_islocked_desc, nfs_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_reallocblks_desc, spec_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, spec_vfree },	/* vfree */
-	{ &vop_truncate_desc, spec_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -211,9 +197,7 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 	{ &vop_ioctl_desc, fifo_ioctl },	/* ioctl */
 	{ &vop_select_desc, fifo_select },	/* select */
 	{ &vop_revoke_desc, fifo_revoke },	/* revoke */
-	{ &vop_mmap_desc, fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, nfs_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 */
@@ -233,12 +217,7 @@ struct vnodeopv_entry_desc fifo_nfsv2nodeop_entries[] = {
 	{ &vop_islocked_desc, nfs_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_reallocblks_desc, fifo_reallocblks },	/* reallocblks */
-	{ &vop_vfree_desc, fifo_vfree },	/* vfree */
-	{ &vop_truncate_desc, fifo_truncate },	/* truncate */
-	{ &vop_update_desc, nfs_update },	/* update */
 	{ &vop_bwrite_desc, vop_generic_bwrite },
 	{ (struct vnodeop_desc*)NULL, (int(*) __P((void *)))NULL }
 };
@@ -2607,28 +2586,6 @@ nfs_strategy(v)
 }
 
 /*
- * Mmap a file
- *
- * NB Currently unsupported.
- */
-/* ARGSUSED */
-int
-nfs_mmap(v)
-	void *v;
-{
-#if 0
-	struct vop_mmap_args /* {
-		struct vnode *a_vp;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap = v;
-#endif
-
-	return (EINVAL);
-}
-
-/*
  * fsync vnode op. Just call nfs_flush() with commit == 1.
  */
 /* ARGSUSED */
@@ -2911,106 +2868,6 @@ nfs_print(v)
 }
 
 /*
- * NFS directory offset lookup.
- * Currently unsupported.
- */
-int
-nfs_blkatoff(v)
-	void *v;
-{
-#if 0
-	struct vop_blkatoff_args /* {
-		struct vnode *a_vp;
-		off_t a_offset;
-		char **a_res;
-		struct buf **a_bpp;
-	} */ *ap = v;
-#endif
-
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS flat namespace allocation.
- * Currently unsupported.
- */
-int
-nfs_valloc(v)
-	void *v;
-{
-#if 0
-	struct vop_valloc_args /* {
-		struct vnode *a_pvp;
-		int a_mode;
-		struct ucred *a_cred;
-		struct vnode **a_vpp;
-	} */ *ap = v;
-#endif
-
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS flat namespace free.
- * Currently unsupported.
- */
-int
-nfs_vfree(v)
-	void *v;
-{
-#if 0
-	struct vop_vfree_args /* {
-		struct vnode *a_pvp;
-		ino_t a_ino;
-		int a_mode;
-	} */ *ap = v;
-#endif
-
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS file truncation.
- */
-int
-nfs_truncate(v)
-	void *v;
-{
-#if 0
-	struct vop_truncate_args /* {
-		struct vnode *a_vp;
-		off_t a_length;
-		int a_flags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap = v;
-#endif
-
-	/* Use nfs_setattr */
-	return (EOPNOTSUPP);
-}
-
-/*
- * NFS update.
- */
-int
-nfs_update(v)
-	void *v;
-#if 0
-	struct vop_update_args /* {
-		struct vnode *a_vp;
-		struct timespec *a_ta;
-		struct timespec *a_tm;
-		int a_waitfor;
-	} */ *ap = v;
-#endif
-{
-
-	/* Use nfs_setattr */
-	return (EOPNOTSUPP);
-}
-
-/*
  * Just call nfs_writebp() with the force argument set to 1.
  */
 int
diff --git a/sys/nfs/nfsnode.h b/sys/nfs/nfsnode.h
index d74feea493a..96c383429bb 100644
--- a/sys/nfs/nfsnode.h
+++ b/sys/nfs/nfsnode.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: nfsnode.h,v 1.7 1998/08/06 19:35:02 csapuntz Exp $	*/
+/*	$OpenBSD: nfsnode.h,v 1.8 2001/06/23 02:14:27 csapuntz Exp $	*/
 /*	$NetBSD: nfsnode.h,v 1.16 1996/02/18 11:54:04 fvdl Exp $	*/
 
 /*
@@ -177,9 +177,7 @@ int	nfsfifo_write __P((void *));
 #define nfs_ioctl ((int (*) __P((void *)))enoioctl)
 #define nfs_select ((int (*) __P((void *)))seltrue)
 #define nfs_revoke vop_generic_revoke
-int	nfs_mmap __P((void *));
 int	nfs_fsync __P((void *));
-#define nfs_seek ((int (*) __P((void *)))nullop)
 int	nfs_remove __P((void *));
 int	nfs_link __P((void *));
 int	nfs_rename __P((void *));
@@ -198,15 +196,10 @@ int	nfs_strategy __P((void *));
 int	nfs_print __P((void *));
 int	nfs_pathconf __P((void *));
 int	nfs_advlock __P((void *));
-int	nfs_blkatoff __P((void *));
 int	nfs_bwrite __P((void *));
 int	nfs_vget __P((struct mount *, ino_t, struct vnode **));
-int	nfs_valloc __P((void *));
 #define nfs_reallocblks \
 	((int (*) __P((void *)))eopnotsupp)
-int	nfs_vfree __P((void *));
-int	nfs_truncate __P((void *));
-int	nfs_update __P((void *));
 
 /* other stuff */
 int	nfs_removeit __P((struct sillyrename *));