regen (Prepare for conversion of select backend -> poll)

2 files changed, 20 insertions, 26 deletions

diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c
index 06fd7c8d106..4bf95f74bd6 100644
--- a/sys/kern/vnode_if.c
+++ b/sys/kern/vnode_if.c
@@ -3,7 +3,7 @@
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	OpenBSD: vnode_if.src,v 1.22 2003/07/21 22:44:50 tedu Exp 
+ *	OpenBSD: vnode_if.src,v 1.23 2003/09/23 16:46:02 millert Exp 
  * by the script:
  *	OpenBSD: vnode_if.sh,v 1.13 2003/06/02 23:28:07 millert Exp 
  */
@@ -477,37 +477,33 @@ int VOP_IOCTL(vp, command, data, fflag, cred, p)
 	return (VCALL(vp, VOFFSET(vop_ioctl), &a));
 }
 
-int vop_select_vp_offsets[] = {
-	VOPARG_OFFSETOF(struct vop_select_args,a_vp),
+int vop_poll_vp_offsets[] = {
+	VOPARG_OFFSETOF(struct vop_poll_args,a_vp),
 	VDESC_NO_OFFSET
 };
-struct vnodeop_desc vop_select_desc = {
+struct vnodeop_desc vop_poll_desc = {
 	0,
-	"vop_select",
+	"vop_poll",
 	0,
-	vop_select_vp_offsets,
+	vop_poll_vp_offsets,
 	VDESC_NO_OFFSET,
-	VOPARG_OFFSETOF(struct vop_select_args, a_cred),
-	VOPARG_OFFSETOF(struct vop_select_args, a_p),
+	VDESC_NO_OFFSET,
+	VOPARG_OFFSETOF(struct vop_poll_args, a_p),
 	VDESC_NO_OFFSET,
 	NULL,
 };
 
-int VOP_SELECT(vp, which, fflags, cred, p)
+int VOP_POLL(vp, events, p)
 	struct vnode *vp;
-	int which;
-	int fflags;
-	struct ucred *cred;
+	int events;
 	struct proc *p;
 {
-	struct vop_select_args a;
-	a.a_desc = VDESC(vop_select);
+	struct vop_poll_args a;
+	a.a_desc = VDESC(vop_poll);
 	a.a_vp = vp;
-	a.a_which = which;
-	a.a_fflags = fflags;
-	a.a_cred = cred;
+	a.a_events = events;
 	a.a_p = p;
-	return (VCALL(vp, VOFFSET(vop_select), &a));
+	return (VCALL(vp, VOFFSET(vop_poll), &a));
 }
 
 int vop_kqfilter_vp_offsets[] = {
@@ -1368,7 +1364,7 @@ struct vnodeop_desc *vfs_op_descs[] = {
 	&vop_write_desc,
 	&vop_lease_desc,
 	&vop_ioctl_desc,
-	&vop_select_desc,
+	&vop_poll_desc,
 	&vop_kqfilter_desc,
 	&vop_revoke_desc,
 	&vop_fsync_desc,
diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h
index 27c55182723..16ad4ab93b9 100644
--- a/sys/sys/vnode_if.h
+++ b/sys/sys/vnode_if.h
@@ -3,7 +3,7 @@
  * (Modifications made here may easily be lost!)
  *
  * Created from the file:
- *	OpenBSD: vnode_if.src,v 1.22 2003/07/21 22:44:50 tedu Exp 
+ *	OpenBSD: vnode_if.src,v 1.23 2003/09/23 16:46:02 millert Exp 
  * by the script:
  *	OpenBSD: vnode_if.sh,v 1.13 2003/06/02 23:28:07 millert Exp 
  */
@@ -172,16 +172,14 @@ extern struct vnodeop_desc vop_ioctl_desc;
 int VOP_IOCTL(struct vnode *, u_long, void *, int, struct ucred *, 
     struct proc *);
 
-struct vop_select_args {
+struct vop_poll_args {
 	struct vnodeop_desc *a_desc;
 	struct vnode *a_vp;
-	int a_which;
-	int a_fflags;
-	struct ucred *a_cred;
+	int a_events;
 	struct proc *a_p;
 };
-extern struct vnodeop_desc vop_select_desc;
-int VOP_SELECT(struct vnode *, int, int, struct ucred *, struct proc *);
+extern struct vnodeop_desc vop_poll_desc;
+int VOP_POLL(struct vnode *, int, struct proc *);
 
 struct vop_kqfilter_args {
 	struct vnodeop_desc *a_desc;