Convert select -> poll.

Delete 'always succeed' select/poll handlers, replaced with generic call.
Flag missing vnode op table entries.

31 files changed, 337 insertions, 261 deletions

diff --git a/sys/fs/cd9660/cd9660_vnops.c b/sys/fs/cd9660/cd9660_vnops.c
index 6a14c87..58d5218 100644
--- a/sys/fs/cd9660/cd9660_vnops.c
+++ b/sys/fs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.36 1997/08/25 10:26:18 kato Exp $
+ * $Id: cd9660_vnops.c,v 1.37 1997/08/26 07:32:32 phk Exp $
  */
 
 #include <sys/param.h>
@@ -65,7 +65,6 @@ static int cd9660_access __P((struct vop_access_args *));
 static int cd9660_getattr __P((struct vop_getattr_args *));
 static int cd9660_read __P((struct vop_read_args *));
 static int cd9660_ioctl __P((struct vop_ioctl_args *));
-static int cd9660_select __P((struct vop_select_args *));
 static int cd9660_mmap __P((struct vop_mmap_args *));
 static int cd9660_seek __P((struct vop_seek_args *));
 struct isoreaddir;
@@ -390,24 +389,6 @@ cd9660_ioctl(ap)
 	return (ENOTTY);
 }
 
-/* ARGSUSED */
-static int
-cd9660_select(ap)
-	struct vop_select_args /* {
-		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap;
-{
-
-	/*
-	 * We should really check to see if I/O is possible.
-	 */
-	return (1);
-}
-
 /*
  * Mmap a file
  *
@@ -999,6 +980,7 @@ cd9660_pathconf(ap)
 #else
 #define	 cd9660_lease_check ((int (*) __P((struct vop_lease_args *)))nullop)
 #endif
+#define cd9660_poll vop_nopoll
 #define cd9660_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define cd9660_remove \
 	((int (*) __P((struct  vop_remove_args *)))eopnotsupp)
@@ -1034,6 +1016,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },	/* lookup */
 	{ &vop_cachedlookup_desc, (vop_t *)cd9660_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)cd9660_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)cd9660_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)cd9660_open },	/* open */
 	{ &vop_close_desc, (vop_t *)cd9660_close },	/* close */
@@ -1044,7 +1027,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)cd9660_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)cd9660_lease_check },/* lease */
 	{ &vop_ioctl_desc, (vop_t *)cd9660_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)cd9660_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)cd9660_poll },	/* poll */
 	{ &vop_revoke_desc, (vop_t *)cd9660_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)cd9660_mmap },	/* mmap */
 	{ &vop_fsync_desc, (vop_t *)cd9660_fsync },	/* fsync */
@@ -1070,9 +1053,12 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)cd9660_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)cd9660_blkatoff },/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)cd9660_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)cd9660_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)cd9660_truncate },/* truncate */
 	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
 	{ NULL, NULL }
 };
@@ -1087,7 +1073,9 @@ vop_t **cd9660_specop_p;
 struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
@@ -1098,7 +1086,7 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
@@ -1124,9 +1112,12 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
 	{ NULL, NULL }
 };
@@ -1138,7 +1129,9 @@ vop_t **cd9660_fifoop_p;
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
 	{ &vop_close_desc, (vop_t *)fifo_close },	/* close */
@@ -1149,7 +1142,7 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_write_desc, (vop_t *)fifo_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
@@ -1175,9 +1168,12 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)fifo_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)fifo_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)fifo_valloc },	/* valloc */
+/* XXX: vop_reallocpages */
 	{ &vop_vfree_desc, (vop_t *)fifo_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
 	{ NULL, NULL }
 };
diff --git a/sys/fs/deadfs/dead_vnops.c b/sys/fs/deadfs/dead_vnops.c
index b167b6f..a8856f9 100644
--- a/sys/fs/deadfs/dead_vnops.c
+++ b/sys/fs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.13 1997/02/22 09:40:13 peter Exp $
+ * $Id: dead_vnops.c,v 1.14 1997/09/02 20:06:08 bde Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@ static int	dead_open __P((struct vop_open_args *));
 static int	dead_read __P((struct vop_read_args *));
 static int	dead_write __P((struct vop_write_args *));
 static int	dead_ioctl __P((struct vop_ioctl_args *));
-static int	dead_select __P((struct vop_select_args *));
+#define dead_poll vop_nopoll
 #define dead_mmap ((int (*) __P((struct  vop_mmap_args *)))dead_badop)
 #define dead_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define dead_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
@@ -91,7 +91,9 @@ vop_t **dead_vnodeop_p;
 static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)dead_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)dead_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)dead_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)dead_open },		/* open */
 	{ &vop_close_desc, (vop_t *)dead_close },	/* close */
@@ -100,8 +102,10 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)dead_setattr },	/* setattr */
 	{ &vop_read_desc, (vop_t *)dead_read },		/* read */
 	{ &vop_write_desc, (vop_t *)dead_write },	/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)dead_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)dead_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)dead_poll },		/* poll */
+/* XXX: vop_revoke */
 	{ &vop_mmap_desc, (vop_t *)dead_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)dead_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)dead_seek },		/* seek */
@@ -126,9 +130,12 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)dead_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)dead_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)dead_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)dead_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)dead_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)dead_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)dead_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
@@ -244,24 +251,6 @@ dead_ioctl(ap)
 	return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap));
 }
 
-/* ARGSUSED */
-static int
-dead_select(ap)
-	struct vop_select_args /* {
-		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap;
-{
-
-	/*
-	 * Let the user find out that the descriptor is gone.
-	 */
-	return (1);
-}
-
 /*
  * Just call the device strategy routine
  */
diff --git a/sys/fs/fdescfs/fdesc_vnops.c b/sys/fs/fdescfs/fdesc_vnops.c
index cb64906..f63bd1b 100644
--- a/sys/fs/fdescfs/fdesc_vnops.c
+++ b/sys/fs/fdescfs/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.24 1997/09/02 20:06:09 bde Exp $
+ * $Id: fdesc_vnops.c,v 1.25 1997/09/07 05:25:53 bde Exp $
  */
 
 /*
@@ -97,7 +97,7 @@ static int	fdesc_read __P((struct vop_read_args *ap));
 static int	fdesc_readdir __P((struct vop_readdir_args *ap));
 static int	fdesc_readlink __P((struct vop_readlink_args *ap));
 static int	fdesc_reclaim __P((struct vop_reclaim_args *ap));
-static int	fdesc_select __P((struct vop_select_args *ap));
+static int	fdesc_poll __P((struct vop_poll_args *ap));
 static int	fdesc_setattr __P((struct vop_setattr_args *ap));
 static int	fdesc_vfree __P((struct vop_vfree_args *ap));
 static int	fdesc_write __P((struct vop_write_args *ap));
@@ -774,28 +774,27 @@ fdesc_ioctl(ap)
 }
 
 static int
-fdesc_select(ap)
-	struct vop_select_args /* {
+fdesc_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
 {
-	int error = EOPNOTSUPP;
+	int revents;
 
 	switch (VTOFDESC(ap->a_vp)->fd_type) {
 	case Fctty:
-		error = (*ctty_cdevsw.d_select)(devctty, ap->a_fflags, ap->a_p);
+		revents = (*ctty_cdevsw.d_poll)(devctty, ap->a_events, ap->a_p);
 		break;
 
 	default:
-		error = EOPNOTSUPP;
+		revents = seltrue(0, ap->a_events, ap->a_p);
 		break;
 	}
 
-	return (error);
+	return (revents);
 }
 
 static int
@@ -945,7 +944,9 @@ fdesc_badop()
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fdesc_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)fdesc_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)fdesc_open },		/* open */
 	{ &vop_close_desc, (vop_t *)fdesc_close },		/* close */
@@ -953,9 +954,10 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_getattr_desc, (vop_t *)fdesc_getattr },		/* getattr */
 	{ &vop_setattr_desc, (vop_t *)fdesc_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)fdesc_read },		/* read */
+/* XXX: vop_lease */
 	{ &vop_write_desc, (vop_t *)fdesc_write },		/* write */
 	{ &vop_ioctl_desc, (vop_t *)fdesc_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)fdesc_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)fdesc_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fdesc_revoke },		/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fdesc_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fdesc_fsync },		/* fsync */
@@ -981,9 +983,12 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)fdesc_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)fdesc_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)fdesc_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)fdesc_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)fdesc_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)fdesc_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)fdesc_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/fs/fifofs/fifo.h b/sys/fs/fifofs/fifo.h
index 0a42690..38314de 100644
--- a/sys/fs/fifofs/fifo.h
+++ b/sys/fs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $Id$
+ * $Id: fifo.h,v 1.13 1997/02/22 09:40:17 peter Exp $
  */
 
 extern vop_t **fifo_vnodeop_p;
@@ -53,7 +53,7 @@ int	fifo_read __P((struct vop_read_args *));
 int	fifo_write __P((struct vop_write_args *));
 #define fifo_lease_check ((int (*) __P((struct  vop_lease_args *)))nullop)
 int	fifo_ioctl __P((struct vop_ioctl_args *));
-int	fifo_select __P((struct vop_select_args *));
+int	fifo_poll __P((struct vop_poll_args *));
 #define	fifo_revoke vop_revoke
 #define fifo_mmap ((int (*) __P((struct  vop_mmap_args *)))fifo_badop)
 #define fifo_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
diff --git a/sys/fs/fifofs/fifo_vnops.c b/sys/fs/fifofs/fifo_vnops.c
index 41b50c5..bab3f53 100644
--- a/sys/fs/fifofs/fifo_vnops.c
+++ b/sys/fs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.25 1997/08/16 19:15:13 wollman Exp $
+ * $Id: fifo_vnops.c,v 1.26 1997/09/02 20:06:11 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,6 +45,7 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
+#include <sys/poll.h>
 #include <sys/un.h>
 #include <miscfs/fifofs/fifo.h>
 
@@ -66,6 +67,7 @@ vop_t **fifo_vnodeop_p;
 static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
@@ -77,7 +79,7 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)fifo_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
@@ -341,31 +343,30 @@ fifo_ioctl(ap)
 
 /* ARGSUSED */
 int
-fifo_select(ap)
-	struct vop_select_args /* {
+fifo_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
 {
 	struct file filetmp;
-	int ready;
+	int revents = 0;
 
-	if (ap->a_fflags & FREAD) {
+	if (ap->a_events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
 		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock;
-		ready = soo_select(&filetmp, ap->a_which, ap->a_p);
-		if (ready)
-			return (ready);
+		if (filetmp.f_data)
+			revents |= soo_poll(&filetmp, ap->a_events, ap->a_cred,
+			    ap->a_p);
 	}
-	if (ap->a_fflags & FWRITE) {
+	if (ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND)) {
 		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock;
-		ready = soo_select(&filetmp, ap->a_which, ap->a_p);
-		if (ready)
-			return (ready);
+		if (filetmp.f_data)
+			revents |= soo_poll(&filetmp, ap->a_events, ap->a_cred,
+			    ap->a_p);
 	}
-	return (0);
+	return (revents);
 }
 
 int
diff --git a/sys/fs/msdosfs/msdosfs_vnops.c b/sys/fs/msdosfs/msdosfs_vnops.c
index e1884c8..f4ce26a 100644
--- a/sys/fs/msdosfs/msdosfs_vnops.c
+++ b/sys/fs/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.42 1997/05/17 18:32:40 phk Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.43 1997/08/26 07:32:39 phk Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -59,6 +59,7 @@
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
+#include <sys/poll.h>
 #include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/malloc.h>
 #include <sys/dirent.h>
@@ -86,7 +87,7 @@ static int msdosfs_setattr __P((struct vop_setattr_args *));
 static int msdosfs_read __P((struct vop_read_args *));
 static int msdosfs_write __P((struct vop_write_args *));
 static int msdosfs_ioctl __P((struct vop_ioctl_args *));
-static int msdosfs_select __P((struct vop_select_args *));
+static int msdosfs_poll __P((struct vop_poll_args *));
 static int msdosfs_mmap __P((struct vop_mmap_args *));
 static int msdosfs_fsync __P((struct vop_fsync_args *));
 static int msdosfs_seek __P((struct vop_seek_args *));
@@ -840,16 +841,16 @@ msdosfs_ioctl(ap)
 }
 
 static int
-msdosfs_select(ap)
-	struct vop_select_args /* {
+msdosfs_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int a_which;
-		int a_fflags;
+		int a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
 {
-	return 1;		/* DOS filesystems never block? */
+	/* DOS filesystems never block? */
+	return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM));
 }
 
 static int
@@ -1990,6 +1991,7 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },	/* lookup */
 	{ &vop_cachedlookup_desc, (vop_t *)msdosfs_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)msdosfs_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)msdosfs_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)msdosfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)msdosfs_close },		/* close */
@@ -1998,8 +2000,10 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)msdosfs_setattr },	/* setattr */
 	{ &vop_read_desc, (vop_t *)msdosfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)msdosfs_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)msdosfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)msdosfs_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)msdosfs_poll },		/* poll */
+/* XXX: vop_revoke */
 	{ &vop_mmap_desc, (vop_t *)msdosfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)msdosfs_fsync },		/* fsync */
 	{ &vop_seek_desc, (vop_t *)msdosfs_seek },		/* seek */
@@ -2022,7 +2026,14 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, (vop_t *)msdosfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, (vop_t *)msdosfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, (vop_t *)msdosfs_advlock },	/* advlock */
+/* XXX: vop_blkatoff */
+/* XXX: vop_valloc */
 	{ &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks },	/* reallocblks */
+/* XXX: vop_vfree */
+/* XXX: vop_truncate */
+/* XXX: vop_update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/fs/portalfs/portal_vnops.c b/sys/fs/portalfs/portal_vnops.c
index 281d563..a8b05cd 100644
--- a/sys/fs/portalfs/portal_vnops.c
+++ b/sys/fs/portalfs/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.19 1997/08/02 14:32:08 bde Exp $
+ * $Id: portal_vnops.c,v 1.20 1997/08/16 19:15:18 wollman Exp $
  */
 
 /*
@@ -654,8 +654,8 @@ portal_badop()
 #define portal_read ((int (*) __P((struct  vop_read_args *)))portal_enotsupp)
 #define portal_write ((int (*) __P((struct  vop_write_args *)))portal_enotsupp)
 #define portal_ioctl ((int (*) __P((struct  vop_ioctl_args *)))portal_enotsupp)
-#define portal_select ((int (*) __P((struct vop_select_args *)))portal_enotsupp)
 #define portal_mmap ((int (*) __P((struct  vop_mmap_args *)))portal_enotsupp)
+#define	portal_poll vop_nopoll
 #define	portal_revoke vop_revoke
 #define portal_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define portal_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
@@ -695,7 +695,9 @@ vop_t **portal_vnodeop_p;
 static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)portal_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)portal_open },		/* open */
 	{ &vop_close_desc, (vop_t *)portal_close },		/* close */
@@ -704,8 +706,9 @@ static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)portal_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)portal_read },		/* read */
 	{ &vop_write_desc, (vop_t *)portal_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)portal_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)portal_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)portal_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)portal_mmap },		/* mmap */
 	{ &vop_revoke_desc, (vop_t *)portal_revoke },		/* revoke */
 	{ &vop_fsync_desc, (vop_t *)portal_fsync },		/* fsync */
@@ -731,9 +734,12 @@ static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)portal_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)portal_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)portal_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)portal_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)portal_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)portal_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/fs/procfs/procfs_vnops.c b/sys/fs/procfs/procfs_vnops.c
index f876318..d34fb2d 100644
--- a/sys/fs/procfs/procfs_vnops.c
+++ b/sys/fs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.30 1997/08/02 14:32:20 bde Exp $
+ *	$Id: procfs_vnops.c,v 1.31 1997/08/12 04:34:30 sef Exp $
  */
 
 /*
@@ -940,8 +940,8 @@ atopid(b, len)
 #define procfs_mknod ((int (*) __P((struct vop_mknod_args *))) procfs_badop)
 #define	procfs_read procfs_rw
 #define	procfs_write procfs_rw
-#define procfs_select ((int (*) __P((struct vop_select_args *))) procfs_badop)
 #define procfs_mmap ((int (*) __P((struct vop_mmap_args *))) procfs_badop)
+#define procfs_poll vop_nopoll
 #define procfs_revoke vop_revoke
 #define procfs_fsync ((int (*) __P((struct vop_fsync_args *))) procfs_badop)
 #define procfs_seek ((int (*) __P((struct vop_seek_args *))) procfs_badop)
@@ -970,7 +970,9 @@ vop_t **procfs_vnodeop_p;
 static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)procfs_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)procfs_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)procfs_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)procfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)procfs_close },		/* close */
@@ -979,8 +981,9 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)procfs_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)procfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)procfs_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)procfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)procfs_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)procfs_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)procfs_mmap },		/* mmap */
 	{ &vop_revoke_desc, (vop_t *)procfs_revoke },		/* revoke */
 	{ &vop_fsync_desc, (vop_t *)procfs_fsync },		/* fsync */
@@ -1006,9 +1009,13 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)procfs_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)procfs_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)procfs_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)procfs_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)procfs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)procfs_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
+/* XXX: vop_bwrite */
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc procfs_vnodeop_opv_desc =
diff --git a/sys/fs/specfs/spec_vnops.c b/sys/fs/specfs/spec_vnops.c
index 98119cb..b5407ee 100644
--- a/sys/fs/specfs/spec_vnops.c
+++ b/sys/fs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.40 1997/05/29 13:29:13 tegge Exp $
+ * $Id: spec_vnops.c,v 1.41 1997/09/02 20:06:12 bde Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,9 @@ vop_t **spec_vnodeop_p;
 static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
@@ -77,7 +79,7 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
@@ -103,11 +105,13 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)spec_update },	/* update */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+/* XXX: vop_putpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc spec_vnodeop_opv_desc =
@@ -433,11 +437,10 @@ spec_ioctl(ap)
 
 /* ARGSUSED */
 int
-spec_select(ap)
-	struct vop_select_args /* {
+spec_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
@@ -446,12 +449,12 @@ spec_select(ap)
 
 	switch (ap->a_vp->v_type) {
 
-	default:
-		return (1);		/* XXX */
-
 	case VCHR:
 		dev = ap->a_vp->v_rdev;
-		return (*cdevsw[major(dev)]->d_select)(dev, ap->a_which, ap->a_p);
+		return (*cdevsw[major(dev)]->d_poll)(dev, ap->a_events, ap->a_p);
+	default:
+		return (vop_nopoll(ap));
+
 	}
 }
 /*
diff --git a/sys/fs/unionfs/union_vnops.c b/sys/fs/unionfs/union_vnops.c
index ecb8fc1..469ae53 100644
--- a/sys/fs/unionfs/union_vnops.c
+++ b/sys/fs/unionfs/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.40 1997/09/04 03:14:49 kato Exp $
+ * $Id: union_vnops.c,v 1.41 1997/09/07 06:46:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -95,7 +95,7 @@ static int	union_rename __P((struct vop_rename_args *ap));
 static int	union_revoke __P((struct vop_revoke_args *ap));
 static int	union_rmdir __P((struct vop_rmdir_args *ap));
 static int	union_seek __P((struct vop_seek_args *ap));
-static int	union_select __P((struct vop_select_args *ap));
+static int	union_poll __P((struct vop_poll_args *ap));
 static int	union_setattr __P((struct vop_setattr_args *ap));
 static int	union_strategy __P((struct vop_strategy_args *ap));
 static int	union_symlink __P((struct vop_symlink_args *ap));
@@ -948,11 +948,10 @@ union_ioctl(ap)
 }
 
 static int
-union_select(ap)
-	struct vop_select_args /* {
+union_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
@@ -960,7 +959,7 @@ union_select(ap)
 	register struct vnode *ovp = OTHERVP(ap->a_vp);
 
 	ap->a_vp = ovp;
-	return (VCALL(ovp, VOFFSET(vop_select), ap));
+	return (VCALL(ovp, VOFFSET(vop_poll), ap));
 }
 
 static int
@@ -1758,6 +1757,7 @@ vop_t **union_vnodeop_p;
 static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)union_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)union_create },		/* create */
 	{ &vop_whiteout_desc, (vop_t *)union_whiteout },	/* whiteout */
 	{ &vop_mknod_desc, (vop_t *)union_mknod },		/* mknod */
@@ -1770,7 +1770,7 @@ static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)union_write },		/* write */
 	{ &vop_lease_desc, (vop_t *)union_lease },		/* lease */
 	{ &vop_ioctl_desc, (vop_t *)union_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)union_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)union_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)union_revoke },		/* revoke */
 	{ &vop_mmap_desc, (vop_t *)union_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)union_fsync },		/* fsync */
@@ -1797,9 +1797,12 @@ static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 #ifdef notdef
 	{ &vop_blkatoff_desc, (vop_t *)union_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)union_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)union_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)union_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)union_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)union_bwrite },		/* bwrite */
 #endif
 	{ NULL, NULL }
diff --git a/sys/gnu/ext2fs/ext2_vnops.c b/sys/gnu/ext2fs/ext2_vnops.c
index a5b6c56..583164b 100644
--- a/sys/gnu/ext2fs/ext2_vnops.c
+++ b/sys/gnu/ext2fs/ext2_vnops.c
@@ -96,7 +96,7 @@ static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_read_desc, (vop_t *)ext2_read },		/* read */
 	{ &vop_write_desc, (vop_t *)ext2_write },	/* write */
 	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)ufs_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)ufs_seek },		/* seek */
@@ -135,6 +135,7 @@ vop_t **ext2_specop_p;
 static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
@@ -145,7 +146,7 @@ static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_read_desc, (vop_t *)ufsspec_read },	/* read */
 	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)spec_seek },		/* seek */
@@ -184,6 +185,7 @@ vop_t **ext2_fifoop_p;
 static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
@@ -194,7 +196,7 @@ static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_read_desc, (vop_t *)ufsfifo_read },	/* read */
 	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)fifo_seek },		/* seek */
diff --git a/sys/gnu/fs/ext2fs/ext2_vnops.c b/sys/gnu/fs/ext2fs/ext2_vnops.c
index a5b6c56..583164b 100644
--- a/sys/gnu/fs/ext2fs/ext2_vnops.c
+++ b/sys/gnu/fs/ext2fs/ext2_vnops.c
@@ -96,7 +96,7 @@ static struct vnodeopv_entry_desc ext2_vnodeop_entries[] = {
 	{ &vop_read_desc, (vop_t *)ext2_read },		/* read */
 	{ &vop_write_desc, (vop_t *)ext2_write },	/* write */
 	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)ufs_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)ufs_seek },		/* seek */
@@ -135,6 +135,7 @@ vop_t **ext2_specop_p;
 static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
@@ -145,7 +146,7 @@ static struct vnodeopv_entry_desc ext2_specop_entries[] = {
 	{ &vop_read_desc, (vop_t *)ufsspec_read },	/* read */
 	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)spec_seek },		/* seek */
@@ -184,6 +185,7 @@ vop_t **ext2_fifoop_p;
 static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
@@ -194,7 +196,7 @@ static struct vnodeopv_entry_desc ext2_fifoop_entries[] = {
 	{ &vop_read_desc, (vop_t *)ufsfifo_read },	/* read */
 	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ext2_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)fifo_seek },		/* seek */
diff --git a/sys/isofs/cd9660/cd9660_vnops.c b/sys/isofs/cd9660/cd9660_vnops.c
index 6a14c87..58d5218 100644
--- a/sys/isofs/cd9660/cd9660_vnops.c
+++ b/sys/isofs/cd9660/cd9660_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)cd9660_vnops.c	8.19 (Berkeley) 5/27/95
- * $Id: cd9660_vnops.c,v 1.36 1997/08/25 10:26:18 kato Exp $
+ * $Id: cd9660_vnops.c,v 1.37 1997/08/26 07:32:32 phk Exp $
  */
 
 #include <sys/param.h>
@@ -65,7 +65,6 @@ static int cd9660_access __P((struct vop_access_args *));
 static int cd9660_getattr __P((struct vop_getattr_args *));
 static int cd9660_read __P((struct vop_read_args *));
 static int cd9660_ioctl __P((struct vop_ioctl_args *));
-static int cd9660_select __P((struct vop_select_args *));
 static int cd9660_mmap __P((struct vop_mmap_args *));
 static int cd9660_seek __P((struct vop_seek_args *));
 struct isoreaddir;
@@ -390,24 +389,6 @@ cd9660_ioctl(ap)
 	return (ENOTTY);
 }
 
-/* ARGSUSED */
-static int
-cd9660_select(ap)
-	struct vop_select_args /* {
-		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap;
-{
-
-	/*
-	 * We should really check to see if I/O is possible.
-	 */
-	return (1);
-}
-
 /*
  * Mmap a file
  *
@@ -999,6 +980,7 @@ cd9660_pathconf(ap)
 #else
 #define	 cd9660_lease_check ((int (*) __P((struct vop_lease_args *)))nullop)
 #endif
+#define cd9660_poll vop_nopoll
 #define cd9660_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define cd9660_remove \
 	((int (*) __P((struct  vop_remove_args *)))eopnotsupp)
@@ -1034,6 +1016,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },	/* lookup */
 	{ &vop_cachedlookup_desc, (vop_t *)cd9660_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)cd9660_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)cd9660_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)cd9660_open },	/* open */
 	{ &vop_close_desc, (vop_t *)cd9660_close },	/* close */
@@ -1044,7 +1027,7 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)cd9660_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)cd9660_lease_check },/* lease */
 	{ &vop_ioctl_desc, (vop_t *)cd9660_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)cd9660_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)cd9660_poll },	/* poll */
 	{ &vop_revoke_desc, (vop_t *)cd9660_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)cd9660_mmap },	/* mmap */
 	{ &vop_fsync_desc, (vop_t *)cd9660_fsync },	/* fsync */
@@ -1070,9 +1053,12 @@ struct vnodeopv_entry_desc cd9660_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)cd9660_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)cd9660_blkatoff },/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)cd9660_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)cd9660_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)cd9660_truncate },/* truncate */
 	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
 	{ NULL, NULL }
 };
@@ -1087,7 +1073,9 @@ vop_t **cd9660_specop_p;
 struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
@@ -1098,7 +1086,7 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
@@ -1124,9 +1112,12 @@ struct vnodeopv_entry_desc cd9660_specop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
 	{ NULL, NULL }
 };
@@ -1138,7 +1129,9 @@ vop_t **cd9660_fifoop_p;
 struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
 	{ &vop_close_desc, (vop_t *)fifo_close },	/* close */
@@ -1149,7 +1142,7 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_write_desc, (vop_t *)fifo_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
@@ -1175,9 +1168,12 @@ struct vnodeopv_entry_desc cd9660_fifoop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)fifo_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)fifo_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)fifo_valloc },	/* valloc */
+/* XXX: vop_reallocpages */
 	{ &vop_vfree_desc, (vop_t *)fifo_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)cd9660_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },
 	{ NULL, NULL }
 };
diff --git a/sys/miscfs/deadfs/dead_vnops.c b/sys/miscfs/deadfs/dead_vnops.c
index b167b6f..a8856f9 100644
--- a/sys/miscfs/deadfs/dead_vnops.c
+++ b/sys/miscfs/deadfs/dead_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dead_vnops.c	8.1 (Berkeley) 6/10/93
- * $Id: dead_vnops.c,v 1.13 1997/02/22 09:40:13 peter Exp $
+ * $Id: dead_vnops.c,v 1.14 1997/09/02 20:06:08 bde Exp $
  */
 
 #include <sys/param.h>
@@ -57,7 +57,7 @@ static int	dead_open __P((struct vop_open_args *));
 static int	dead_read __P((struct vop_read_args *));
 static int	dead_write __P((struct vop_write_args *));
 static int	dead_ioctl __P((struct vop_ioctl_args *));
-static int	dead_select __P((struct vop_select_args *));
+#define dead_poll vop_nopoll
 #define dead_mmap ((int (*) __P((struct  vop_mmap_args *)))dead_badop)
 #define dead_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define dead_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
@@ -91,7 +91,9 @@ vop_t **dead_vnodeop_p;
 static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)dead_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)dead_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)dead_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)dead_open },		/* open */
 	{ &vop_close_desc, (vop_t *)dead_close },	/* close */
@@ -100,8 +102,10 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)dead_setattr },	/* setattr */
 	{ &vop_read_desc, (vop_t *)dead_read },		/* read */
 	{ &vop_write_desc, (vop_t *)dead_write },	/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)dead_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)dead_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)dead_poll },		/* poll */
+/* XXX: vop_revoke */
 	{ &vop_mmap_desc, (vop_t *)dead_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)dead_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)dead_seek },		/* seek */
@@ -126,9 +130,12 @@ static struct vnodeopv_entry_desc dead_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)dead_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)dead_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)dead_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)dead_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)dead_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)dead_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)dead_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
@@ -244,24 +251,6 @@ dead_ioctl(ap)
 	return (VCALL(ap->a_vp, VOFFSET(vop_ioctl), ap));
 }
 
-/* ARGSUSED */
-static int
-dead_select(ap)
-	struct vop_select_args /* {
-		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap;
-{
-
-	/*
-	 * Let the user find out that the descriptor is gone.
-	 */
-	return (1);
-}
-
 /*
  * Just call the device strategy routine
  */
diff --git a/sys/miscfs/devfs/devfs_vnops.c b/sys/miscfs/devfs/devfs_vnops.c
index 73d6ff5..f735ba8 100644
--- a/sys/miscfs/devfs/devfs_vnops.c
+++ b/sys/miscfs/devfs/devfs_vnops.c
@@ -1,7 +1,7 @@
 /*
  *  Written by Julian Elischer (julian@DIALix.oz.au)
  *
- *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.37 1997/08/25 20:31:00 phk Exp $
+ *	$Header: /home/ncvs/src/sys/miscfs/devfs/devfs_vnops.c,v 1.38 1997/08/27 02:58:40 julian Exp $
  *
  * symlinks can wait 'til later.
  */
@@ -1654,7 +1654,7 @@ devfs_dropvnode(dn_p dnp)
 #define devfs_mknod ((int (*) __P((struct  vop_mknod_args *)))devfs_enotsupp)
 #define devfs_close ((int (*) __P((struct  vop_close_args *)))nullop)
 #define devfs_ioctl ((int (*) __P((struct  vop_ioctl_args *)))devfs_enotsupp)
-#define devfs_select ((int (*) __P((struct  vop_select_args *)))devfs_enotsupp)
+#define devfs_poll	vop_nopoll
 #define devfs_mmap ((int (*) __P((struct  vop_mmap_args *)))devfs_enotsupp)
 #define devfs_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define devfs_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
@@ -1691,7 +1691,9 @@ vop_t **devfs_vnodeop_p;
 static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)devfs_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)devfs_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)devfs_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)devfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)devfs_close },		/* close */
@@ -1700,8 +1702,10 @@ static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)devfs_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)devfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)devfs_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)devfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)devfs_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)devfs_poll },		/* poll */
+/* XXX: vop_revoke */
 	{ &vop_mmap_desc, (vop_t *)devfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)devfs_fsync },		/* fsync */
 	{ &vop_seek_desc, (vop_t *)devfs_seek },		/* seek */
@@ -1726,9 +1730,12 @@ static struct vnodeopv_entry_desc devfs_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)devfs_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)devfs_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)devfs_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)devfs_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)devfs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)devfs_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)devfs_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
@@ -1781,7 +1788,9 @@ vop_t **dev_spec_vnodeop_p;
 static struct vnodeopv_entry_desc dev_spec_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
@@ -1790,8 +1799,10 @@ static struct vnodeopv_entry_desc dev_spec_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)devfs_setattr },	/* setattr */
 	{ &vop_read_desc, (vop_t *)devfs_read },	/* read */
 	{ &vop_write_desc, (vop_t *)devfs_write },	/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
+/* XXX: vop_revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
 	{ &vop_seek_desc, (vop_t *)spec_seek },		/* seek */
@@ -1816,9 +1827,12 @@ static struct vnodeopv_entry_desc dev_spec_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)spec_update },	/* update */
+	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/miscfs/fdesc/fdesc_vnops.c b/sys/miscfs/fdesc/fdesc_vnops.c
index cb64906..f63bd1b 100644
--- a/sys/miscfs/fdesc/fdesc_vnops.c
+++ b/sys/miscfs/fdesc/fdesc_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)fdesc_vnops.c	8.9 (Berkeley) 1/21/94
  *
- * $Id: fdesc_vnops.c,v 1.24 1997/09/02 20:06:09 bde Exp $
+ * $Id: fdesc_vnops.c,v 1.25 1997/09/07 05:25:53 bde Exp $
  */
 
 /*
@@ -97,7 +97,7 @@ static int	fdesc_read __P((struct vop_read_args *ap));
 static int	fdesc_readdir __P((struct vop_readdir_args *ap));
 static int	fdesc_readlink __P((struct vop_readlink_args *ap));
 static int	fdesc_reclaim __P((struct vop_reclaim_args *ap));
-static int	fdesc_select __P((struct vop_select_args *ap));
+static int	fdesc_poll __P((struct vop_poll_args *ap));
 static int	fdesc_setattr __P((struct vop_setattr_args *ap));
 static int	fdesc_vfree __P((struct vop_vfree_args *ap));
 static int	fdesc_write __P((struct vop_write_args *ap));
@@ -774,28 +774,27 @@ fdesc_ioctl(ap)
 }
 
 static int
-fdesc_select(ap)
-	struct vop_select_args /* {
+fdesc_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
 {
-	int error = EOPNOTSUPP;
+	int revents;
 
 	switch (VTOFDESC(ap->a_vp)->fd_type) {
 	case Fctty:
-		error = (*ctty_cdevsw.d_select)(devctty, ap->a_fflags, ap->a_p);
+		revents = (*ctty_cdevsw.d_poll)(devctty, ap->a_events, ap->a_p);
 		break;
 
 	default:
-		error = EOPNOTSUPP;
+		revents = seltrue(0, ap->a_events, ap->a_p);
 		break;
 	}
 
-	return (error);
+	return (revents);
 }
 
 static int
@@ -945,7 +944,9 @@ fdesc_badop()
 static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fdesc_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fdesc_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)fdesc_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)fdesc_open },		/* open */
 	{ &vop_close_desc, (vop_t *)fdesc_close },		/* close */
@@ -953,9 +954,10 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_getattr_desc, (vop_t *)fdesc_getattr },		/* getattr */
 	{ &vop_setattr_desc, (vop_t *)fdesc_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)fdesc_read },		/* read */
+/* XXX: vop_lease */
 	{ &vop_write_desc, (vop_t *)fdesc_write },		/* write */
 	{ &vop_ioctl_desc, (vop_t *)fdesc_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)fdesc_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)fdesc_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fdesc_revoke },		/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fdesc_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fdesc_fsync },		/* fsync */
@@ -981,9 +983,12 @@ static struct vnodeopv_entry_desc fdesc_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)fdesc_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)fdesc_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)fdesc_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)fdesc_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)fdesc_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)fdesc_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)fdesc_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/miscfs/fifofs/fifo.h b/sys/miscfs/fifofs/fifo.h
index 0a42690..38314de 100644
--- a/sys/miscfs/fifofs/fifo.h
+++ b/sys/miscfs/fifofs/fifo.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo.h	8.6 (Berkeley) 5/21/95
- * $Id$
+ * $Id: fifo.h,v 1.13 1997/02/22 09:40:17 peter Exp $
  */
 
 extern vop_t **fifo_vnodeop_p;
@@ -53,7 +53,7 @@ int	fifo_read __P((struct vop_read_args *));
 int	fifo_write __P((struct vop_write_args *));
 #define fifo_lease_check ((int (*) __P((struct  vop_lease_args *)))nullop)
 int	fifo_ioctl __P((struct vop_ioctl_args *));
-int	fifo_select __P((struct vop_select_args *));
+int	fifo_poll __P((struct vop_poll_args *));
 #define	fifo_revoke vop_revoke
 #define fifo_mmap ((int (*) __P((struct  vop_mmap_args *)))fifo_badop)
 #define fifo_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
diff --git a/sys/miscfs/fifofs/fifo_vnops.c b/sys/miscfs/fifofs/fifo_vnops.c
index 41b50c5..bab3f53 100644
--- a/sys/miscfs/fifofs/fifo_vnops.c
+++ b/sys/miscfs/fifofs/fifo_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)fifo_vnops.c	8.10 (Berkeley) 5/27/95
- * $Id: fifo_vnops.c,v 1.25 1997/08/16 19:15:13 wollman Exp $
+ * $Id: fifo_vnops.c,v 1.26 1997/09/02 20:06:11 bde Exp $
  */
 
 #include <sys/param.h>
@@ -45,6 +45,7 @@
 #include <sys/fcntl.h>
 #include <sys/file.h>
 #include <sys/malloc.h>
+#include <sys/poll.h>
 #include <sys/un.h>
 #include <miscfs/fifofs/fifo.h>
 
@@ -66,6 +67,7 @@ vop_t **fifo_vnodeop_p;
 static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
@@ -77,7 +79,7 @@ static struct vnodeopv_entry_desc fifo_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)fifo_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
@@ -341,31 +343,30 @@ fifo_ioctl(ap)
 
 /* ARGSUSED */
 int
-fifo_select(ap)
-	struct vop_select_args /* {
+fifo_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
 {
 	struct file filetmp;
-	int ready;
+	int revents = 0;
 
-	if (ap->a_fflags & FREAD) {
+	if (ap->a_events & (POLLIN | POLLPRI | POLLRDNORM | POLLRDBAND)) {
 		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_readsock;
-		ready = soo_select(&filetmp, ap->a_which, ap->a_p);
-		if (ready)
-			return (ready);
+		if (filetmp.f_data)
+			revents |= soo_poll(&filetmp, ap->a_events, ap->a_cred,
+			    ap->a_p);
 	}
-	if (ap->a_fflags & FWRITE) {
+	if (ap->a_events & (POLLOUT | POLLWRNORM | POLLWRBAND)) {
 		filetmp.f_data = (caddr_t)ap->a_vp->v_fifoinfo->fi_writesock;
-		ready = soo_select(&filetmp, ap->a_which, ap->a_p);
-		if (ready)
-			return (ready);
+		if (filetmp.f_data)
+			revents |= soo_poll(&filetmp, ap->a_events, ap->a_cred,
+			    ap->a_p);
 	}
-	return (0);
+	return (revents);
 }
 
 int
diff --git a/sys/miscfs/kernfs/kernfs_vnops.c b/sys/miscfs/kernfs/kernfs_vnops.c
index bcd3c87..6232ec3 100644
--- a/sys/miscfs/kernfs/kernfs_vnops.c
+++ b/sys/miscfs/kernfs/kernfs_vnops.c
@@ -34,7 +34,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)kernfs_vnops.c	8.15 (Berkeley) 5/21/95
- * $Id: kernfs_vnops.c,v 1.19 1997/02/22 09:40:19 peter Exp $
+ * $Id: kernfs_vnops.c,v 1.20 1997/09/02 20:06:12 bde Exp $
  */
 
 /*
@@ -715,7 +715,7 @@ kernfs_badop()
 #define kernfs_mknod ((int (*) __P((struct  vop_mknod_args *)))eopnotsupp)
 #define kernfs_close ((int (*) __P((struct  vop_close_args *)))nullop)
 #define kernfs_ioctl ((int (*) __P((struct  vop_ioctl_args *)))eopnotsupp)
-#define kernfs_select ((int (*) __P((struct  vop_select_args *)))eopnotsupp)
+#define kernfs_poll vop_nopoll
 #define kernfs_revoke vop_revoke
 #define kernfs_mmap ((int (*) __P((struct  vop_mmap_args *)))eopnotsupp)
 #define kernfs_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
@@ -750,7 +750,9 @@ vop_t	**kernfs_vnodeop_p;
 static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)kernfs_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)kernfs_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)kernfs_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)kernfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)kernfs_close },		/* close */
@@ -759,8 +761,9 @@ static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)kernfs_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)kernfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)kernfs_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)kernfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)kernfs_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)kernfs_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)kernfs_revoke },		/* revoke */
 	{ &vop_mmap_desc, (vop_t *)kernfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)kernfs_fsync },		/* fsync */
@@ -786,9 +789,12 @@ static struct vnodeopv_entry_desc kernfs_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)kernfs_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)kernfs_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)kernfs_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)kernfs_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)kernfs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)kernfs_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)kernfs_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/miscfs/portal/portal_vnops.c b/sys/miscfs/portal/portal_vnops.c
index 281d563..a8b05cd 100644
--- a/sys/miscfs/portal/portal_vnops.c
+++ b/sys/miscfs/portal/portal_vnops.c
@@ -35,7 +35,7 @@
  *
  *	@(#)portal_vnops.c	8.14 (Berkeley) 5/21/95
  *
- * $Id: portal_vnops.c,v 1.19 1997/08/02 14:32:08 bde Exp $
+ * $Id: portal_vnops.c,v 1.20 1997/08/16 19:15:18 wollman Exp $
  */
 
 /*
@@ -654,8 +654,8 @@ portal_badop()
 #define portal_read ((int (*) __P((struct  vop_read_args *)))portal_enotsupp)
 #define portal_write ((int (*) __P((struct  vop_write_args *)))portal_enotsupp)
 #define portal_ioctl ((int (*) __P((struct  vop_ioctl_args *)))portal_enotsupp)
-#define portal_select ((int (*) __P((struct vop_select_args *)))portal_enotsupp)
 #define portal_mmap ((int (*) __P((struct  vop_mmap_args *)))portal_enotsupp)
+#define	portal_poll vop_nopoll
 #define	portal_revoke vop_revoke
 #define portal_fsync ((int (*) __P((struct  vop_fsync_args *)))nullop)
 #define portal_seek ((int (*) __P((struct  vop_seek_args *)))nullop)
@@ -695,7 +695,9 @@ vop_t **portal_vnodeop_p;
 static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)portal_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)portal_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)portal_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)portal_open },		/* open */
 	{ &vop_close_desc, (vop_t *)portal_close },		/* close */
@@ -704,8 +706,9 @@ static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)portal_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)portal_read },		/* read */
 	{ &vop_write_desc, (vop_t *)portal_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)portal_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)portal_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)portal_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)portal_mmap },		/* mmap */
 	{ &vop_revoke_desc, (vop_t *)portal_revoke },		/* revoke */
 	{ &vop_fsync_desc, (vop_t *)portal_fsync },		/* fsync */
@@ -731,9 +734,12 @@ static struct vnodeopv_entry_desc portal_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)portal_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)portal_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)portal_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)portal_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)portal_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)portal_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)portal_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/miscfs/procfs/procfs_vnops.c b/sys/miscfs/procfs/procfs_vnops.c
index f876318..d34fb2d 100644
--- a/sys/miscfs/procfs/procfs_vnops.c
+++ b/sys/miscfs/procfs/procfs_vnops.c
@@ -36,7 +36,7 @@
  *
  *	@(#)procfs_vnops.c	8.18 (Berkeley) 5/21/95
  *
- *	$Id: procfs_vnops.c,v 1.30 1997/08/02 14:32:20 bde Exp $
+ *	$Id: procfs_vnops.c,v 1.31 1997/08/12 04:34:30 sef Exp $
  */
 
 /*
@@ -940,8 +940,8 @@ atopid(b, len)
 #define procfs_mknod ((int (*) __P((struct vop_mknod_args *))) procfs_badop)
 #define	procfs_read procfs_rw
 #define	procfs_write procfs_rw
-#define procfs_select ((int (*) __P((struct vop_select_args *))) procfs_badop)
 #define procfs_mmap ((int (*) __P((struct vop_mmap_args *))) procfs_badop)
+#define procfs_poll vop_nopoll
 #define procfs_revoke vop_revoke
 #define procfs_fsync ((int (*) __P((struct vop_fsync_args *))) procfs_badop)
 #define procfs_seek ((int (*) __P((struct vop_seek_args *))) procfs_badop)
@@ -970,7 +970,9 @@ vop_t **procfs_vnodeop_p;
 static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)procfs_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)procfs_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)procfs_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)procfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)procfs_close },		/* close */
@@ -979,8 +981,9 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)procfs_setattr },		/* setattr */
 	{ &vop_read_desc, (vop_t *)procfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)procfs_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)procfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)procfs_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)procfs_poll },		/* poll */
 	{ &vop_mmap_desc, (vop_t *)procfs_mmap },		/* mmap */
 	{ &vop_revoke_desc, (vop_t *)procfs_revoke },		/* revoke */
 	{ &vop_fsync_desc, (vop_t *)procfs_fsync },		/* fsync */
@@ -1006,9 +1009,13 @@ static struct vnodeopv_entry_desc procfs_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)procfs_advlock },		/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)procfs_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)procfs_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)procfs_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)procfs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)procfs_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
+/* XXX: vop_bwrite */
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc procfs_vnodeop_opv_desc =
diff --git a/sys/miscfs/specfs/spec_vnops.c b/sys/miscfs/specfs/spec_vnops.c
index 98119cb..b5407ee 100644
--- a/sys/miscfs/specfs/spec_vnops.c
+++ b/sys/miscfs/specfs/spec_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)spec_vnops.c	8.14 (Berkeley) 5/21/95
- * $Id: spec_vnops.c,v 1.40 1997/05/29 13:29:13 tegge Exp $
+ * $Id: spec_vnops.c,v 1.41 1997/09/02 20:06:12 bde Exp $
  */
 
 #include <sys/param.h>
@@ -66,7 +66,9 @@ vop_t **spec_vnodeop_p;
 static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)spec_close },	/* close */
@@ -77,7 +79,7 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)spec_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
@@ -103,11 +105,13 @@ static struct vnodeopv_entry_desc spec_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)spec_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)spec_update },	/* update */
-	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+/* XXX: vop_putpages */
+	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
 static struct vnodeopv_desc spec_vnodeop_opv_desc =
@@ -433,11 +437,10 @@ spec_ioctl(ap)
 
 /* ARGSUSED */
 int
-spec_select(ap)
-	struct vop_select_args /* {
+spec_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
@@ -446,12 +449,12 @@ spec_select(ap)
 
 	switch (ap->a_vp->v_type) {
 
-	default:
-		return (1);		/* XXX */
-
 	case VCHR:
 		dev = ap->a_vp->v_rdev;
-		return (*cdevsw[major(dev)]->d_select)(dev, ap->a_which, ap->a_p);
+		return (*cdevsw[major(dev)]->d_poll)(dev, ap->a_events, ap->a_p);
+	default:
+		return (vop_nopoll(ap));
+
 	}
 }
 /*
diff --git a/sys/miscfs/specfs/specdev.h b/sys/miscfs/specfs/specdev.h
index ce71afb..fe046ce 100644
--- a/sys/miscfs/specfs/specdev.h
+++ b/sys/miscfs/specfs/specdev.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)specdev.h	8.6 (Berkeley) 5/21/95
- * $Id$
+ * $Id: specdev.h,v 1.11 1997/02/22 09:40:35 peter Exp $
  */
 
 /*
@@ -93,7 +93,7 @@ int	spec_read __P((struct vop_read_args *));
 int	spec_write __P((struct vop_write_args *));
 #define	spec_lease_check ((int (*) __P((struct  vop_lease_args *)))nullop)
 int	spec_ioctl __P((struct vop_ioctl_args *));
-int	spec_select __P((struct vop_select_args *));
+int	spec_poll __P((struct vop_poll_args *));
 #define	spec_revoke vop_revoke
 #define spec_mmap ((int (*) __P((struct  vop_mmap_args *)))spec_badop)
 int	spec_fsync __P((struct  vop_fsync_args *));
diff --git a/sys/miscfs/union/union_vnops.c b/sys/miscfs/union/union_vnops.c
index ecb8fc1..469ae53 100644
--- a/sys/miscfs/union/union_vnops.c
+++ b/sys/miscfs/union/union_vnops.c
@@ -35,7 +35,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)union_vnops.c	8.32 (Berkeley) 6/23/95
- * $Id: union_vnops.c,v 1.40 1997/09/04 03:14:49 kato Exp $
+ * $Id: union_vnops.c,v 1.41 1997/09/07 06:46:34 bde Exp $
  */
 
 #include <sys/param.h>
@@ -95,7 +95,7 @@ static int	union_rename __P((struct vop_rename_args *ap));
 static int	union_revoke __P((struct vop_revoke_args *ap));
 static int	union_rmdir __P((struct vop_rmdir_args *ap));
 static int	union_seek __P((struct vop_seek_args *ap));
-static int	union_select __P((struct vop_select_args *ap));
+static int	union_poll __P((struct vop_poll_args *ap));
 static int	union_setattr __P((struct vop_setattr_args *ap));
 static int	union_strategy __P((struct vop_strategy_args *ap));
 static int	union_symlink __P((struct vop_symlink_args *ap));
@@ -948,11 +948,10 @@ union_ioctl(ap)
 }
 
 static int
-union_select(ap)
-	struct vop_select_args /* {
+union_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
+		int  a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
@@ -960,7 +959,7 @@ union_select(ap)
 	register struct vnode *ovp = OTHERVP(ap->a_vp);
 
 	ap->a_vp = ovp;
-	return (VCALL(ovp, VOFFSET(vop_select), ap));
+	return (VCALL(ovp, VOFFSET(vop_poll), ap));
 }
 
 static int
@@ -1758,6 +1757,7 @@ vop_t **union_vnodeop_p;
 static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)union_lookup },		/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)union_create },		/* create */
 	{ &vop_whiteout_desc, (vop_t *)union_whiteout },	/* whiteout */
 	{ &vop_mknod_desc, (vop_t *)union_mknod },		/* mknod */
@@ -1770,7 +1770,7 @@ static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)union_write },		/* write */
 	{ &vop_lease_desc, (vop_t *)union_lease },		/* lease */
 	{ &vop_ioctl_desc, (vop_t *)union_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)union_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)union_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)union_revoke },		/* revoke */
 	{ &vop_mmap_desc, (vop_t *)union_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)union_fsync },		/* fsync */
@@ -1797,9 +1797,12 @@ static struct vnodeopv_entry_desc union_vnodeop_entries[] = {
 #ifdef notdef
 	{ &vop_blkatoff_desc, (vop_t *)union_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)union_valloc },		/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)union_vfree },		/* vfree */
 	{ &vop_truncate_desc, (vop_t *)union_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)union_update },		/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)union_bwrite },		/* bwrite */
 #endif
 	{ NULL, NULL }
diff --git a/sys/msdosfs/msdosfs_vnops.c b/sys/msdosfs/msdosfs_vnops.c
index e1884c8..f4ce26a 100644
--- a/sys/msdosfs/msdosfs_vnops.c
+++ b/sys/msdosfs/msdosfs_vnops.c
@@ -1,4 +1,4 @@
-/*	$Id: msdosfs_vnops.c,v 1.42 1997/05/17 18:32:40 phk Exp $ */
+/*	$Id: msdosfs_vnops.c,v 1.43 1997/08/26 07:32:39 phk Exp $ */
 /*	$NetBSD: msdosfs_vnops.c,v 1.20 1994/08/21 18:44:13 ws Exp $	*/
 
 /*-
@@ -59,6 +59,7 @@
 #include <sys/mount.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
+#include <sys/poll.h>
 #include <miscfs/specfs/specdev.h> /* XXX */	/* defines v_rdev */
 #include <sys/malloc.h>
 #include <sys/dirent.h>
@@ -86,7 +87,7 @@ static int msdosfs_setattr __P((struct vop_setattr_args *));
 static int msdosfs_read __P((struct vop_read_args *));
 static int msdosfs_write __P((struct vop_write_args *));
 static int msdosfs_ioctl __P((struct vop_ioctl_args *));
-static int msdosfs_select __P((struct vop_select_args *));
+static int msdosfs_poll __P((struct vop_poll_args *));
 static int msdosfs_mmap __P((struct vop_mmap_args *));
 static int msdosfs_fsync __P((struct vop_fsync_args *));
 static int msdosfs_seek __P((struct vop_seek_args *));
@@ -840,16 +841,16 @@ msdosfs_ioctl(ap)
 }
 
 static int
-msdosfs_select(ap)
-	struct vop_select_args /* {
+msdosfs_poll(ap)
+	struct vop_poll_args /* {
 		struct vnode *a_vp;
-		int a_which;
-		int a_fflags;
+		int a_events;
 		struct ucred *a_cred;
 		struct proc *a_p;
 	} */ *ap;
 {
-	return 1;		/* DOS filesystems never block? */
+	/* DOS filesystems never block? */
+	return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM));
 }
 
 static int
@@ -1990,6 +1991,7 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_lookup_desc, (vop_t *)vfs_cache_lookup },	/* lookup */
 	{ &vop_cachedlookup_desc, (vop_t *)msdosfs_lookup },	/* lookup */
 	{ &vop_create_desc, (vop_t *)msdosfs_create },		/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)msdosfs_mknod },		/* mknod */
 	{ &vop_open_desc, (vop_t *)msdosfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)msdosfs_close },		/* close */
@@ -1998,8 +2000,10 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)msdosfs_setattr },	/* setattr */
 	{ &vop_read_desc, (vop_t *)msdosfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)msdosfs_write },		/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)msdosfs_ioctl },		/* ioctl */
-	{ &vop_select_desc, (vop_t *)msdosfs_select },		/* select */
+	{ &vop_poll_desc, (vop_t *)msdosfs_poll },		/* poll */
+/* XXX: vop_revoke */
 	{ &vop_mmap_desc, (vop_t *)msdosfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)msdosfs_fsync },		/* fsync */
 	{ &vop_seek_desc, (vop_t *)msdosfs_seek },		/* seek */
@@ -2022,7 +2026,14 @@ static struct vnodeopv_entry_desc msdosfs_vnodeop_entries[] = {
 	{ &vop_islocked_desc, (vop_t *)msdosfs_islocked },	/* islocked */
 	{ &vop_pathconf_desc, (vop_t *)msdosfs_pathconf },	/* pathconf */
 	{ &vop_advlock_desc, (vop_t *)msdosfs_advlock },	/* advlock */
+/* XXX: vop_blkatoff */
+/* XXX: vop_valloc */
 	{ &vop_reallocblks_desc, (vop_t *)msdosfs_reallocblks },	/* reallocblks */
+/* XXX: vop_vfree */
+/* XXX: vop_truncate */
+/* XXX: vop_update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },		/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/ufs/ffs/ffs_vnops.c b/sys/ufs/ffs/ffs_vnops.c
index 256488a..a546fb8 100644
--- a/sys/ufs/ffs/ffs_vnops.c
+++ b/sys/ufs/ffs/ffs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ffs_vnops.c	8.15 (Berkeley) 5/14/95
- * $Id: ffs_vnops.c,v 1.27 1997/08/26 07:32:48 phk Exp $
+ * $Id: ffs_vnops.c,v 1.28 1997/09/02 20:06:46 bde Exp $
  */
 
 #include <sys/param.h>
@@ -87,7 +87,7 @@ static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)ffs_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)ufs_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)ufs_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)ufs_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ffs_fsync },	/* fsync */
@@ -118,6 +118,7 @@ static struct vnodeopv_entry_desc ffs_vnodeop_entries[] = {
 	{ &vop_truncate_desc, (vop_t *)ffs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)ffs_update },	/* update */
 	{ &vop_getpages_desc, (vop_t *)ffs_getpages},	/* getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
@@ -128,7 +129,9 @@ vop_t **ffs_specop_p;
 static struct vnodeopv_entry_desc ffs_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)ufsspec_close },	/* close */
@@ -139,7 +142,7 @@ static struct vnodeopv_entry_desc ffs_specop_entries[] = {
 	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ffs_fsync },	/* fsync */
@@ -170,6 +173,7 @@ static struct vnodeopv_entry_desc ffs_specop_entries[] = {
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)ffs_update },	/* update */
 	{ &vop_getpages_desc, (vop_t *)spec_getpages},	/* getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
@@ -180,7 +184,9 @@ vop_t **ffs_fifoop_p;
 static struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
 	{ &vop_close_desc, (vop_t *)ufsfifo_close },	/* close */
@@ -191,7 +197,7 @@ static struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
 	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)ffs_fsync },	/* fsync */
@@ -221,6 +227,8 @@ static struct vnodeopv_entry_desc ffs_fifoop_entries[] = {
 	{ &vop_vfree_desc, (vop_t *)ffs_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)ffs_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)vn_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/ufs/lfs/lfs_vnops.c b/sys/ufs/lfs/lfs_vnops.c
index cd9d9e5..80ba28f 100644
--- a/sys/ufs/lfs/lfs_vnops.c
+++ b/sys/ufs/lfs/lfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)lfs_vnops.c	8.13 (Berkeley) 6/10/95
- * $Id: lfs_vnops.c,v 1.21 1997/03/23 00:45:27 bde Exp $
+ * $Id: lfs_vnops.c,v 1.22 1997/09/02 20:06:49 bde Exp $
  */
 
 #include <sys/param.h>
@@ -74,9 +74,10 @@ vop_t **lfs_vnodeop_p;
 static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)ufs_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)ufs_create },	/* create */
-	{ &vop_mknod_desc, (vop_t *)ufs_mknod },	/* mknod */
 	{ &vop_whiteout_desc, (vop_t *)ufs_whiteout },	/* whiteout */
+	{ &vop_mknod_desc, (vop_t *)ufs_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)ufs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)lfs_close },	/* close */
 	{ &vop_access_desc, (vop_t *)ufs_access },	/* access */
@@ -86,7 +87,7 @@ static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_write_desc, (vop_t *)lfs_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)ufs_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)ufs_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)ufs_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)ufs_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)ufs_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)ufs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)lfs_fsync },	/* fsync */
@@ -112,9 +113,12 @@ static struct vnodeopv_entry_desc lfs_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)ufs_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)lfs_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)lfs_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)lfs_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)lfs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)lfs_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
@@ -125,7 +129,9 @@ vop_t **lfs_specop_p;
 static struct vnodeopv_entry_desc lfs_specop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)spec_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)spec_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)spec_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)spec_open },		/* open */
 	{ &vop_close_desc, (vop_t *)ufsspec_close },	/* close */
@@ -136,7 +142,7 @@ static struct vnodeopv_entry_desc lfs_specop_entries[] = {
 	{ &vop_write_desc, (vop_t *)ufsspec_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)spec_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)spec_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)spec_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)spec_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)spec_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)spec_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
@@ -162,9 +168,12 @@ static struct vnodeopv_entry_desc lfs_specop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)spec_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)spec_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)spec_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)lfs_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)spec_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)lfs_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
@@ -175,7 +184,9 @@ vop_t **lfs_fifoop_p;
 static struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)fifo_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)fifo_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)fifo_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)fifo_open },		/* open */
 	{ &vop_close_desc, (vop_t *)ufsfifo_close },	/* close */
@@ -186,7 +197,7 @@ static struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_write_desc, (vop_t *)ufsfifo_write },	/* write */
 	{ &vop_lease_desc, (vop_t *)fifo_lease_check },	/* lease */
 	{ &vop_ioctl_desc, (vop_t *)fifo_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)fifo_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)fifo_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)fifo_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)fifo_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)fifo_fsync },	/* fsync */
@@ -212,9 +223,12 @@ static struct vnodeopv_entry_desc lfs_fifoop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)fifo_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)fifo_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)fifo_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)lfs_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)fifo_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)lfs_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)lfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/ufs/mfs/mfs_vnops.c b/sys/ufs/mfs/mfs_vnops.c
index 335c4e3..06ea12d 100644
--- a/sys/ufs/mfs/mfs_vnops.c
+++ b/sys/ufs/mfs/mfs_vnops.c
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfs_vnops.c	8.11 (Berkeley) 5/22/95
- * $Id: mfs_vnops.c,v 1.17 1997/02/22 09:47:33 peter Exp $
+ * $Id: mfs_vnops.c,v 1.18 1997/08/02 14:33:23 bde Exp $
  */
 
 #include <sys/param.h>
@@ -63,7 +63,9 @@ vop_t **mfs_vnodeop_p;
 static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = {
 	{ &vop_default_desc, (vop_t *)vn_default_error },
 	{ &vop_lookup_desc, (vop_t *)mfs_lookup },	/* lookup */
+/* XXX: vop_cachedlookup */
 	{ &vop_create_desc, (vop_t *)mfs_create },	/* create */
+/* XXX: vop_whiteout */
 	{ &vop_mknod_desc, (vop_t *)mfs_mknod },	/* mknod */
 	{ &vop_open_desc, (vop_t *)mfs_open },		/* open */
 	{ &vop_close_desc, (vop_t *)mfs_close },	/* close */
@@ -72,8 +74,9 @@ static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = {
 	{ &vop_setattr_desc, (vop_t *)mfs_setattr },	/* setattr */
 	{ &vop_read_desc, (vop_t *)mfs_read },		/* read */
 	{ &vop_write_desc, (vop_t *)mfs_write },	/* write */
+/* XXX: vop_lease */
 	{ &vop_ioctl_desc, (vop_t *)mfs_ioctl },	/* ioctl */
-	{ &vop_select_desc, (vop_t *)mfs_select },	/* select */
+	{ &vop_poll_desc, (vop_t *)mfs_poll },		/* poll */
 	{ &vop_revoke_desc, (vop_t *)mfs_revoke },	/* revoke */
 	{ &vop_mmap_desc, (vop_t *)mfs_mmap },		/* mmap */
 	{ &vop_fsync_desc, (vop_t *)spec_fsync },	/* fsync */
@@ -99,9 +102,12 @@ static struct vnodeopv_entry_desc mfs_vnodeop_entries[] = {
 	{ &vop_advlock_desc, (vop_t *)mfs_advlock },	/* advlock */
 	{ &vop_blkatoff_desc, (vop_t *)mfs_blkatoff },	/* blkatoff */
 	{ &vop_valloc_desc, (vop_t *)mfs_valloc },	/* valloc */
+/* XXX: vop_reallocblks */
 	{ &vop_vfree_desc, (vop_t *)mfs_vfree },	/* vfree */
 	{ &vop_truncate_desc, (vop_t *)mfs_truncate },	/* truncate */
 	{ &vop_update_desc, (vop_t *)mfs_update },	/* update */
+/* XXX: vop_getpages */
+/* XXX: vop_putpages */
 	{ &vop_bwrite_desc, (vop_t *)mfs_bwrite },	/* bwrite */
 	{ NULL, NULL }
 };
diff --git a/sys/ufs/mfs/mfsnode.h b/sys/ufs/mfs/mfsnode.h
index eb0a510..53fe40a 100644
--- a/sys/ufs/mfs/mfsnode.h
+++ b/sys/ufs/mfs/mfsnode.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)mfsnode.h	8.3 (Berkeley) 5/19/95
- * $Id$
+ * $Id: mfsnode.h,v 1.8 1997/02/22 09:47:34 peter Exp $
  */
 
 #ifndef _UFS_MFS_MFSNODE_H_
@@ -66,7 +66,7 @@ struct mfsnode {
 #define mfs_setattr ((int (*) __P((struct  vop_setattr_args *)))mfs_badop)
 #define mfs_read ((int (*) __P((struct  vop_read_args *)))mfs_badop)
 #define mfs_write ((int (*) __P((struct  vop_write_args *)))mfs_badop)
-#define mfs_select ((int (*) __P((struct  vop_select_args *)))mfs_badop)
+#define mfs_poll ((int (*) __P((struct  vop_poll_args *)))mfs_badop)
 #define mfs_mmap ((int (*) __P((struct  vop_mmap_args *)))mfs_badop)
 #define mfs_seek ((int (*) __P((struct  vop_seek_args *)))mfs_badop)
 #define mfs_remove ((int (*) __P((struct  vop_remove_args *)))mfs_badop)
diff --git a/sys/ufs/ufs/ufs_extern.h b/sys/ufs/ufs/ufs_extern.h
index 690e31c..b4880ad 100644
--- a/sys/ufs/ufs/ufs_extern.h
+++ b/sys/ufs/ufs/ufs_extern.h
@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_extern.h	8.10 (Berkeley) 5/14/95
- * $Id: ufs_extern.h,v 1.15 1997/08/16 19:16:26 wollman Exp $
+ * $Id: ufs_extern.h,v 1.16 1997/08/26 07:32:50 phk Exp $
  */
 
 #ifndef _UFS_UFS_EXTERN_H_
@@ -110,7 +110,7 @@ int	 ufs_rename __P((struct vop_rename_args *));
 int	 ufs_rmdir __P((struct vop_rmdir_args *));
 int	 ufs_root __P((struct mount *, struct vnode **));
 int	 ufs_seek __P((struct vop_seek_args *));
-int	 ufs_select __P((struct vop_select_args *));
+#define	 ufs_poll vop_nopoll
 int	 ufs_setattr __P((struct vop_setattr_args *));
 int	 ufs_start __P((struct mount *, int, struct proc *));
 int	 ufs_strategy __P((struct vop_strategy_args *));
diff --git a/sys/ufs/ufs/ufs_vnops.c b/sys/ufs/ufs/ufs_vnops.c
index 471977f..5576990 100644
--- a/sys/ufs/ufs/ufs_vnops.c
+++ b/sys/ufs/ufs/ufs_vnops.c
@@ -36,7 +36,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufs_vnops.c	8.27 (Berkeley) 5/27/95
- * $Id: ufs_vnops.c,v 1.55 1997/08/26 04:36:27 dyson Exp $
+ * $Id: ufs_vnops.c,v 1.56 1997/09/02 20:06:59 bde Exp $
  */
 
 #include "opt_quota.h"
@@ -598,24 +598,6 @@ ufs_ioctl(ap)
 	return (ENOTTY);
 }
 
-/* ARGSUSED */
-int
-ufs_select(ap)
-	struct vop_select_args /* {
-		struct vnode *a_vp;
-		int  a_which;
-		int  a_fflags;
-		struct ucred *a_cred;
-		struct proc *a_p;
-	} */ *ap;
-{
-
-	/*
-	 * We should really check to see if I/O is possible.
-	 */
-	return (1);
-}
-
 /*
  * Mmap a file
  *