Remove unused VOP_POLL(). The patch cuts cttypoll()'s dependency on VOP_POLL(). cttypoll() has been called through spec_poll() and is unused. The function cannot be removed yet as the build expects the symbol.
(Next, remove d_poll from struct cdevsw.) OK? Index: share/man/man9/VOP_LOOKUP.9 =================================================================== RCS file: src/share/man/man9/VOP_LOOKUP.9,v retrieving revision 1.45 diff -u -p -r1.45 VOP_LOOKUP.9 --- share/man/man9/VOP_LOOKUP.9 12 Dec 2021 09:14:58 -0000 1.45 +++ share/man/man9/VOP_LOOKUP.9 25 Jun 2022 12:34:58 -0000 @@ -48,7 +48,6 @@ .Nm VOP_MKNOD , .Nm VOP_OPEN , .Nm VOP_PATHCONF , -.Nm VOP_POLL , .Nm VOP_PRINT , .Nm VOP_READ , .Nm VOP_READDIR , @@ -194,13 +193,6 @@ .Fa "register_t *retval" .Fc .Ft int -.Fo VOP_POLL -.Fa "struct vnode *vp" -.Fa "int fflag" -.Fa "int events" -.Fa "struct proc *p" -.Fc -.Ft int .Fo VOP_PRINT .Fa "struct vnode *vp" .Fc @@ -724,28 +716,6 @@ The result is placed in .Fa *retval . Upon success, zero is returned; otherwise, an appropriate error code is returned. -.Pp -.It Fn VOP_POLL vp fflag events p -Determine whether the vnode -.Fa vp -is ready to perform the operations specified by -.Fa events -(see -.Xr poll 2 ) -with file flags -.Fa fflag -for the calling process -.Fa p . -The -.Fn selrecord -routine may be used to detect selection collisions for multiple -processes sleeping on the same file, waiting for I/O -to become possible, although all file systems currently assume that -I/O is always possible. -The return value specifies which operations from -.Fa events -were found to be ready, which may be performed without the need for -blocking. .Pp .It Fn VOP_PRINT vp Print information about the vnode to the kernel message buffer. Index: sys/isofs/cd9660/cd9660_node.h =================================================================== RCS file: src/sys/isofs/cd9660/cd9660_node.h,v retrieving revision 1.21 diff -u -p -r1.21 cd9660_node.h --- sys/isofs/cd9660/cd9660_node.h 20 Jan 2019 16:09:41 -0000 1.21 +++ sys/isofs/cd9660/cd9660_node.h 25 Jun 2022 12:35:54 -0000 @@ -99,7 +99,6 @@ int cd9660_getattr(void *); int cd9660_setattr(void *); int cd9660_read(void *); int cd9660_ioctl(void *); -int cd9660_poll(void *); int cd9660_mmap(void *); int cd9660_seek(void *); int cd9660_readdir(void *); Index: sys/isofs/cd9660/cd9660_vnops.c =================================================================== RCS file: src/sys/isofs/cd9660/cd9660_vnops.c,v retrieving revision 1.92 diff -u -p -r1.92 cd9660_vnops.c --- sys/isofs/cd9660/cd9660_vnops.c 12 Dec 2021 09:14:59 -0000 1.92 +++ sys/isofs/cd9660/cd9660_vnops.c 25 Jun 2022 12:35:54 -0000 @@ -54,7 +54,6 @@ #include <sys/dirent.h> #include <sys/ioctl.h> #include <sys/ioccom.h> -#include <sys/poll.h> #include <sys/specdev.h> #include <sys/unistd.h> @@ -290,18 +289,6 @@ cd9660_ioctl(void *v) return (ENOTTY); } -/* ARGSUSED */ -int -cd9660_poll(void *v) -{ - struct vop_poll_args *ap = v; - - /* - * We should really check to see if I/O is possible. - */ - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); -} - /* * Mmap a file * @@ -825,7 +812,6 @@ const struct vops cd9660_vops = { .vop_read = cd9660_read, .vop_write = eopnotsupp, .vop_ioctl = cd9660_ioctl, - .vop_poll = cd9660_poll, .vop_kqfilter = cd9660_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = nullop, @@ -872,7 +858,6 @@ const struct vops cd9660_specvops = { .vop_read = spec_read, .vop_write = spec_write, .vop_ioctl = spec_ioctl, - .vop_poll = spec_poll, .vop_kqfilter = spec_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = spec_fsync, @@ -914,7 +899,6 @@ const struct vops cd9660_fifovops = { .vop_read = fifo_read, .vop_write = fifo_write, .vop_ioctl = fifo_ioctl, - .vop_poll = fifo_poll, .vop_kqfilter = fifo_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = nullop, Index: sys/kern/spec_vnops.c =================================================================== RCS file: src/sys/kern/spec_vnops.c,v retrieving revision 1.107 diff -u -p -r1.107 spec_vnops.c --- sys/kern/spec_vnops.c 11 Dec 2021 09:28:26 -0000 1.107 +++ sys/kern/spec_vnops.c 25 Jun 2022 12:35:54 -0000 @@ -48,7 +48,6 @@ #include <sys/fcntl.h> #include <sys/disklabel.h> #include <sys/lockf.h> -#include <sys/poll.h> #include <sys/dkio.h> #include <sys/malloc.h> #include <sys/specdev.h> @@ -74,7 +73,6 @@ const struct vops spec_vops = { .vop_read = spec_read, .vop_write = spec_write, .vop_ioctl = spec_ioctl, - .vop_poll = spec_poll, .vop_kqfilter = spec_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = spec_fsync, @@ -379,21 +377,6 @@ spec_ioctl(void *v) } } -int -spec_poll(void *v) -{ - struct vop_poll_args *ap = v; - dev_t dev; - - switch (ap->a_vp->v_type) { - default: - return (ap->a_events & - (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); - case VCHR: - dev = ap->a_vp->v_rdev; - return (*cdevsw[major(dev)].d_poll)(dev, ap->a_events, ap->a_p); - } -} int spec_kqfilter(void *v) { Index: sys/kern/tty_tty.c =================================================================== RCS file: src/sys/kern/tty_tty.c,v retrieving revision 1.29 diff -u -p -r1.29 tty_tty.c --- sys/kern/tty_tty.c 11 Dec 2021 09:28:26 -0000 1.29 +++ sys/kern/tty_tty.c 25 Jun 2022 12:35:54 -0000 @@ -146,11 +146,8 @@ cttyioctl(dev_t dev, u_long cmd, caddr_t int cttypoll(dev_t dev, int events, struct proc *p) { - struct vnode *ttyvp = cttyvp(p); - - if (ttyvp == NULL) /* try operation to get EOF/failure */ - return (seltrue(dev, events, p)); - return (VOP_POLL(ttyvp, FREAD|FWRITE, events, p)); + panic("not implemented"); + return (0); } int Index: sys/kern/uipc_socket2.c =================================================================== RCS file: src/sys/kern/uipc_socket2.c,v retrieving revision 1.123 diff -u -p -r1.123 uipc_socket2.c --- sys/kern/uipc_socket2.c 6 Jun 2022 14:45:41 -0000 1.123 +++ sys/kern/uipc_socket2.c 25 Jun 2022 12:35:54 -0000 @@ -409,7 +409,6 @@ sowakeup(struct socket *so, struct sockb { soassertlocked(so); - sb->sb_flags &= ~SB_SEL; if (sb->sb_flags & SB_WAIT) { sb->sb_flags &= ~SB_WAIT; wakeup(&sb->sb_cc); Index: sys/kern/vfs_vops.c =================================================================== RCS file: src/sys/kern/vfs_vops.c,v retrieving revision 1.34 diff -u -p -r1.34 vfs_vops.c --- sys/kern/vfs_vops.c 12 Dec 2021 09:14:59 -0000 1.34 +++ sys/kern/vfs_vops.c 25 Jun 2022 12:35:55 -0000 @@ -265,22 +265,6 @@ VOP_IOCTL(struct vnode *vp, u_long comma } int -VOP_POLL(struct vnode *vp, int fflag, int events, struct proc *p) -{ - struct vop_poll_args a; - a.a_vp = vp; - a.a_fflag = fflag; - a.a_events = events; - a.a_p = p; - - KASSERT(p == curproc); - if (vp->v_op->vop_poll == NULL) - return (EOPNOTSUPP); - - return ((vp->v_op->vop_poll)(&a)); -} - -int VOP_KQFILTER(struct vnode *vp, int fflag, struct knote *kn) { struct vop_kqfilter_args a; Index: sys/miscfs/deadfs/dead_vnops.c =================================================================== RCS file: src/sys/miscfs/deadfs/dead_vnops.c,v retrieving revision 1.40 diff -u -p -r1.40 dead_vnops.c --- sys/miscfs/deadfs/dead_vnops.c 20 Dec 2021 16:22:24 -0000 1.40 +++ sys/miscfs/deadfs/dead_vnops.c 25 Jun 2022 12:35:56 -0000 @@ -40,7 +40,6 @@ #include <sys/lock.h> #include <sys/errno.h> #include <sys/buf.h> -#include <sys/poll.h> /* * Prototypes for dead operations on vnodes. @@ -51,7 +50,6 @@ int dead_open(void *); int dead_read(void *); int dead_write(void *); int dead_ioctl(void *); -int dead_poll(void *); int dead_kqfilter(void *v); int dead_inactive(void *); int dead_lock(void *); @@ -73,7 +71,6 @@ const struct vops dead_vops = { .vop_read = dead_read, .vop_write = dead_write, .vop_ioctl = dead_ioctl, - .vop_poll = dead_poll, .vop_kqfilter = dead_kqfilter, .vop_revoke = NULL, .vop_fsync = nullop, @@ -154,20 +151,6 @@ dead_ioctl(void *v) if (!chkvnlock(ap->a_vp)) return (EBADF); return ((ap->a_vp->v_op->vop_ioctl)(ap)); -} - -/* ARGSUSED */ -int -dead_poll(void *v) -{ -#if 0 - struct vop_poll_args *ap = v; -#endif - - /* - * Let the user find out that the descriptor is gone. - */ - return (POLLHUP); } int Index: sys/miscfs/fifofs/fifo.h =================================================================== RCS file: src/sys/miscfs/fifofs/fifo.h,v retrieving revision 1.23 diff -u -p -r1.23 fifo.h --- sys/miscfs/fifofs/fifo.h 2 Oct 2021 08:51:41 -0000 1.23 +++ sys/miscfs/fifofs/fifo.h 25 Jun 2022 12:35:56 -0000 @@ -43,7 +43,6 @@ int fifo_close(void *); int fifo_read(void *); int fifo_write(void *); int fifo_ioctl(void *); -int fifo_poll(void *); int fifo_kqfilter(void *); int fifo_inactive(void *); int fifo_reclaim(void *); Index: sys/miscfs/fifofs/fifo_vnops.c =================================================================== RCS file: src/sys/miscfs/fifofs/fifo_vnops.c,v retrieving revision 1.94 diff -u -p -r1.94 fifo_vnops.c --- sys/miscfs/fifofs/fifo_vnops.c 6 Jun 2022 14:45:41 -0000 1.94 +++ sys/miscfs/fifofs/fifo_vnops.c 25 Jun 2022 12:35:56 -0000 @@ -48,7 +48,6 @@ #include <sys/event.h> #include <sys/errno.h> #include <sys/malloc.h> -#include <sys/poll.h> #include <sys/unistd.h> #include <miscfs/fifofs/fifo.h> @@ -76,7 +75,6 @@ const struct vops fifo_vops = { .vop_read = fifo_read, .vop_write = fifo_write, .vop_ioctl = fifo_ioctl, - .vop_poll = fifo_poll, .vop_kqfilter = fifo_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = nullop, @@ -309,53 +307,6 @@ fifo_ioctl(void *v) return (error); } return (0); -} - -/* ARGSUSED */ -int -fifo_poll(void *v) -{ - struct vop_poll_args *ap = v; - struct socket *rso = ap->a_vp->v_fifoinfo->fi_readsock; - struct socket *wso = ap->a_vp->v_fifoinfo->fi_writesock; - int events = 0; - int revents = 0; - - /* - * FIFOs don't support out-of-band or high priority data. - */ - solock(rso); - if (ap->a_fflag & FREAD) - events |= ap->a_events & (POLLIN | POLLRDNORM); - if (ap->a_fflag & FWRITE) - events |= ap->a_events & (POLLOUT | POLLWRNORM); - - if (events & (POLLIN | POLLRDNORM)) { - if (soreadable(rso)) - revents |= events & (POLLIN | POLLRDNORM); - } - /* NOTE: POLLHUP and POLLOUT/POLLWRNORM are mutually exclusive */ - if ((rso->so_state & SS_ISDISCONNECTED) && !(ap->a_events & POLL_NOHUP)) { - revents |= POLLHUP; - } else if (events & (POLLOUT | POLLWRNORM)) { - if (sowriteable(wso)) - revents |= events & (POLLOUT | POLLWRNORM); - } - if (revents == 0) { - /* We want to return POLLHUP even if no valid events set. */ - if (events == 0 && !(ap->a_events & POLL_NOHUP)) - events = POLLIN; - if (events & (POLLIN | POLLRDNORM)) { - selrecord(ap->a_p, &rso->so_rcv.sb_sel); - rso->so_rcv.sb_flags |= SB_SEL; - } - if (events & (POLLOUT | POLLWRNORM)) { - selrecord(ap->a_p, &wso->so_snd.sb_sel); - wso->so_snd.sb_flags |= SB_SEL; - } - } - sounlock(rso); - return (revents); } int Index: sys/miscfs/fuse/fuse_vnops.c =================================================================== RCS file: src/sys/miscfs/fuse/fuse_vnops.c,v retrieving revision 1.65 diff -u -p -r1.65 fuse_vnops.c --- sys/miscfs/fuse/fuse_vnops.c 11 Dec 2021 09:28:26 -0000 1.65 +++ sys/miscfs/fuse/fuse_vnops.c 25 Jun 2022 12:35:56 -0000 @@ -24,7 +24,6 @@ #include <sys/malloc.h> #include <sys/mount.h> #include <sys/namei.h> -#include <sys/poll.h> #include <sys/pool.h> #include <sys/proc.h> #include <sys/specdev.h> @@ -57,7 +56,6 @@ int fusefs_create(void *); int fusefs_mknod(void *); int fusefs_read(void *); int fusefs_write(void *); -int fusefs_poll(void *); int fusefs_remove(void *); int fusefs_rename(void *); int fusefs_mkdir(void *); @@ -87,7 +85,6 @@ const struct vops fusefs_vops = { .vop_read = fusefs_read, .vop_write = fusefs_write, .vop_ioctl = fusefs_ioctl, - .vop_poll = fusefs_poll, .vop_kqfilter = fusefs_kqfilter, .vop_revoke = NULL, .vop_fsync = fusefs_fsync, @@ -1230,17 +1227,6 @@ fusefs_write(void *v) fb_delete(fbuf); return (error); -} - -int -fusefs_poll(void *v) -{ - struct vop_poll_args *ap = v; - - /* - * We should really check to see if I/O is possible. - */ - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } int Index: sys/msdosfs/denode.h =================================================================== RCS file: src/sys/msdosfs/denode.h,v retrieving revision 1.34 diff -u -p -r1.34 denode.h --- sys/msdosfs/denode.h 21 Jan 2019 18:09:21 -0000 1.34 +++ sys/msdosfs/denode.h 25 Jun 2022 12:35:56 -0000 @@ -271,7 +271,6 @@ int msdosfs_setattr(void *); int msdosfs_read(void *); int msdosfs_write(void *); int msdosfs_ioctl(void *); -int msdosfs_poll(void *); int msdosfs_fsync(void *); int msdosfs_remove(void *); int msdosfs_link(void *); Index: sys/msdosfs/msdosfs_vnops.c =================================================================== RCS file: src/sys/msdosfs/msdosfs_vnops.c,v retrieving revision 1.137 diff -u -p -r1.137 msdosfs_vnops.c --- sys/msdosfs/msdosfs_vnops.c 12 Dec 2021 09:14:59 -0000 1.137 +++ sys/msdosfs/msdosfs_vnops.c 25 Jun 2022 12:35:57 -0000 @@ -67,7 +67,6 @@ #include <sys/pool.h> #include <sys/dirent.h> /* defines dirent structure */ #include <sys/lockf.h> -#include <sys/poll.h> #include <sys/unistd.h> #include <msdosfs/bpb.h> @@ -769,14 +768,6 @@ msdosfs_ioctl(void *v) return (ENOTTY); } -int -msdosfs_poll(void *v) -{ - struct vop_poll_args *ap = v; - - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); -} - /* * Flush the blocks of a file to disk. * @@ -1910,7 +1901,6 @@ const struct vops msdosfs_vops = { .vop_read = msdosfs_read, .vop_write = msdosfs_write, .vop_ioctl = msdosfs_ioctl, - .vop_poll = msdosfs_poll, .vop_kqfilter = msdosfs_kqfilter, .vop_fsync = msdosfs_fsync, .vop_remove = msdosfs_remove, Index: sys/nfs/nfs_vnops.c =================================================================== RCS file: src/sys/nfs/nfs_vnops.c,v retrieving revision 1.188 diff -u -p -r1.188 nfs_vnops.c --- sys/nfs/nfs_vnops.c 12 Dec 2021 09:14:59 -0000 1.188 +++ sys/nfs/nfs_vnops.c 25 Jun 2022 12:35:57 -0000 @@ -44,7 +44,6 @@ #include <sys/kernel.h> #include <sys/systm.h> #include <sys/resourcevar.h> -#include <sys/poll.h> #include <sys/proc.h> #include <sys/mount.h> #include <sys/buf.h> @@ -101,7 +100,6 @@ int nfs_mknodrpc(struct vnode *, struct int nfs_null(struct vnode *, struct ucred *, struct proc *); int nfs_open(void *); int nfs_pathconf(void *); -int nfs_poll(void *); int nfs_print(void *); int nfs_read(void *); int nfs_readdir(void *); @@ -149,7 +147,6 @@ const struct vops nfs_vops = { .vop_read = nfs_read, .vop_write = nfs_write, .vop_ioctl = nfs_ioctl, - .vop_poll = nfs_poll, .vop_kqfilter = nfs_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = nfs_fsync, @@ -197,7 +194,6 @@ const struct vops nfs_specvops = { .vop_mknod = vop_generic_badop, .vop_open = spec_open, .vop_ioctl = spec_ioctl, - .vop_poll = spec_poll, .vop_kqfilter = spec_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, @@ -239,7 +235,6 @@ const struct vops nfs_fifovops = { .vop_mknod = vop_generic_badop, .vop_open = fifo_open, .vop_ioctl = fifo_ioctl, - .vop_poll = fifo_poll, .vop_kqfilter = fifo_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, @@ -3264,17 +3259,6 @@ nfsspec_access(void *v) return (vaccess(vp->v_type, va.va_mode, va.va_uid, va.va_gid, ap->a_mode, ap->a_cred)); -} - -int -nfs_poll(void *v) -{ - struct vop_poll_args *ap = v; - - /* - * We should really check to see if I/O is possible. - */ - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } /* Index: sys/sys/socketvar.h =================================================================== RCS file: src/sys/sys/socketvar.h,v retrieving revision 1.103 diff -u -p -r1.103 socketvar.h --- sys/sys/socketvar.h 20 Jun 2022 01:39:44 -0000 1.103 +++ sys/sys/socketvar.h 25 Jun 2022 12:35:57 -0000 @@ -122,7 +122,6 @@ struct socket { #define SB_LOCK 0x01 /* lock on data queue */ #define SB_WANT 0x02 /* someone is waiting to lock */ #define SB_WAIT 0x04 /* someone is waiting for data/space */ -#define SB_SEL 0x08 /* someone is selecting */ #define SB_ASYNC 0x10 /* ASYNC I/O, need signals */ #define SB_SPLICE 0x20 /* buffer is splice source or drain */ #define SB_NOINTR 0x40 /* operations not interruptible */ @@ -172,7 +171,7 @@ sb_notify(struct socket *so, struct sock { KASSERT(sb == &so->so_rcv || sb == &so->so_snd); soassertlocked(so); - return ((sb->sb_flags & (SB_WAIT|SB_SEL|SB_ASYNC|SB_SPLICE)) != 0 || + return ((sb->sb_flags & (SB_WAIT|SB_ASYNC|SB_SPLICE)) != 0 || !klist_empty(&sb->sb_sel.si_note)); } Index: sys/sys/specdev.h =================================================================== RCS file: src/sys/sys/specdev.h,v retrieving revision 1.40 diff -u -p -r1.40 specdev.h --- sys/sys/specdev.h 2 Oct 2021 08:51:41 -0000 1.40 +++ sys/sys/specdev.h 25 Jun 2022 12:35:57 -0000 @@ -100,7 +100,6 @@ int spec_close(void *); int spec_read(void *); int spec_write(void *); int spec_ioctl(void *); -int spec_poll(void *); int spec_kqfilter(void *); int spec_fsync(void *); int spec_inactive(void *); Index: sys/sys/vnode.h =================================================================== RCS file: src/sys/sys/vnode.h,v retrieving revision 1.165 diff -u -p -r1.165 vnode.h --- sys/sys/vnode.h 12 Apr 2022 14:34:11 -0000 1.165 +++ sys/sys/vnode.h 25 Jun 2022 12:35:57 -0000 @@ -282,7 +282,6 @@ struct vops { int (*vop_mknod)(void *); int (*vop_open)(void *); int (*vop_pathconf)(void *); - int (*vop_poll)(void *); int (*vop_print)(void *); int (*vop_read)(void *); int (*vop_readdir)(void *); @@ -404,14 +403,6 @@ struct vop_ioctl_args { }; int VOP_IOCTL(struct vnode *, u_long, void *, int, struct ucred *, struct proc *); - -struct vop_poll_args { - struct vnode *a_vp; - int a_fflag; - int a_events; - struct proc *a_p; -}; -int VOP_POLL(struct vnode *, int, int, struct proc *); struct vop_kqfilter_args { struct vnode *a_vp; Index: sys/tmpfs/tmpfs_fifoops.c =================================================================== RCS file: src/sys/tmpfs/tmpfs_fifoops.c,v retrieving revision 1.6 diff -u -p -r1.6 tmpfs_fifoops.c --- sys/tmpfs/tmpfs_fifoops.c 2 Oct 2021 08:51:41 -0000 1.6 +++ sys/tmpfs/tmpfs_fifoops.c 25 Jun 2022 12:35:57 -0000 @@ -64,7 +64,6 @@ const struct vops tmpfs_fifovops = { .vop_read = tmpfs_fifo_read, .vop_write = tmpfs_fifo_write, .vop_ioctl = fifo_ioctl, - .vop_poll = fifo_poll, .vop_kqfilter = fifo_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = tmpfs_fifo_fsync, Index: sys/tmpfs/tmpfs_specops.c =================================================================== RCS file: src/sys/tmpfs/tmpfs_specops.c,v retrieving revision 1.8 diff -u -p -r1.8 tmpfs_specops.c --- sys/tmpfs/tmpfs_specops.c 2 Oct 2021 08:51:41 -0000 1.8 +++ sys/tmpfs/tmpfs_specops.c 25 Jun 2022 12:35:57 -0000 @@ -71,7 +71,6 @@ const struct vops tmpfs_specvops = { .vop_mknod = vop_generic_badop, .vop_open = spec_open, .vop_ioctl = spec_ioctl, - .vop_poll = spec_poll, .vop_kqfilter = spec_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, Index: sys/tmpfs/tmpfs_vnops.c =================================================================== RCS file: src/sys/tmpfs/tmpfs_vnops.c,v retrieving revision 1.51 diff -u -p -r1.51 tmpfs_vnops.c --- sys/tmpfs/tmpfs_vnops.c 11 Dec 2021 09:28:26 -0000 1.51 +++ sys/tmpfs/tmpfs_vnops.c 25 Jun 2022 12:35:57 -0000 @@ -46,7 +46,6 @@ #include <sys/unistd.h> #include <sys/vnode.h> #include <sys/lockf.h> -#include <sys/poll.h> #include <sys/file.h> #include <miscfs/fifofs/fifo.h> @@ -70,7 +69,6 @@ const struct vops tmpfs_vops = { .vop_read = tmpfs_read, .vop_write = tmpfs_write, .vop_ioctl = tmpfs_ioctl, - .vop_poll = tmpfs_poll, .vop_kqfilter = tmpfs_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = tmpfs_fsync, @@ -1173,13 +1171,6 @@ int tmpfs_bwrite(void *v) { return 0; -} - -int -tmpfs_poll(void *v) -{ - struct vop_poll_args *ap = v; - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } int Index: sys/tmpfs/tmpfs_vnops.h =================================================================== RCS file: src/sys/tmpfs/tmpfs_vnops.h,v retrieving revision 1.6 diff -u -p -r1.6 tmpfs_vnops.h --- sys/tmpfs/tmpfs_vnops.h 20 Jan 2020 23:21:56 -0000 1.6 +++ sys/tmpfs/tmpfs_vnops.h 25 Jun 2022 12:35:57 -0000 @@ -55,7 +55,6 @@ int tmpfs_setattr (void *); int tmpfs_read (void *); int tmpfs_write (void *); int tmpfs_ioctl (void *); -int tmpfs_poll (void *); int tmpfs_fsync (void *); int tmpfs_remove (void *); int tmpfs_link (void *); Index: sys/ufs/ext2fs/ext2fs_vnops.c =================================================================== RCS file: src/sys/ufs/ext2fs/ext2fs_vnops.c,v retrieving revision 1.89 diff -u -p -r1.89 ext2fs_vnops.c --- sys/ufs/ext2fs/ext2fs_vnops.c 2 Oct 2021 08:51:41 -0000 1.89 +++ sys/ufs/ext2fs/ext2fs_vnops.c 25 Jun 2022 12:35:58 -0000 @@ -1278,7 +1278,6 @@ const struct vops ext2fs_vops = { .vop_read = ext2fs_read, .vop_write = ext2fs_write, .vop_ioctl = ufs_ioctl, - .vop_poll = ufs_poll, .vop_kqfilter = ufs_kqfilter, .vop_revoke = NULL, .vop_fsync = ext2fs_fsync, @@ -1325,7 +1324,6 @@ const struct vops ext2fs_specvops = { .vop_mknod = vop_generic_badop, .vop_open = spec_open, .vop_ioctl = spec_ioctl, - .vop_poll = spec_poll, .vop_kqfilter = spec_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, @@ -1367,7 +1365,6 @@ const struct vops ext2fs_fifovops = { .vop_mknod = vop_generic_badop, .vop_open = fifo_open, .vop_ioctl = fifo_ioctl, - .vop_poll = fifo_poll, .vop_kqfilter = fifo_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, Index: sys/ufs/ffs/ffs_vnops.c =================================================================== RCS file: src/sys/ufs/ffs/ffs_vnops.c,v retrieving revision 1.99 diff -u -p -r1.99 ffs_vnops.c --- sys/ufs/ffs/ffs_vnops.c 2 Oct 2021 08:51:41 -0000 1.99 +++ sys/ufs/ffs/ffs_vnops.c 25 Jun 2022 12:35:58 -0000 @@ -69,7 +69,6 @@ const struct vops ffs_vops = { .vop_read = ffs_read, .vop_write = ffs_write, .vop_ioctl = ufs_ioctl, - .vop_poll = ufs_poll, .vop_kqfilter = ufs_kqfilter, .vop_revoke = vop_generic_revoke, .vop_fsync = ffs_fsync, @@ -116,7 +115,6 @@ const struct vops ffs_specvops = { .vop_mknod = vop_generic_badop, .vop_open = spec_open, .vop_ioctl = spec_ioctl, - .vop_poll = spec_poll, .vop_kqfilter = spec_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, @@ -158,7 +156,6 @@ const struct vops ffs_fifovops = { .vop_mknod = vop_generic_badop, .vop_open = fifo_open, .vop_ioctl = fifo_ioctl, - .vop_poll = fifo_poll, .vop_kqfilter = fifo_kqfilter, .vop_revoke = vop_generic_revoke, .vop_remove = vop_generic_badop, Index: sys/ufs/mfs/mfs_vnops.c =================================================================== RCS file: src/sys/ufs/mfs/mfs_vnops.c,v retrieving revision 1.59 diff -u -p -r1.59 mfs_vnops.c --- sys/ufs/mfs/mfs_vnops.c 12 Dec 2021 09:17:17 -0000 1.59 +++ sys/ufs/mfs/mfs_vnops.c 25 Jun 2022 12:35:58 -0000 @@ -59,7 +59,6 @@ const struct vops mfs_vops = { .vop_read = vop_generic_badop, .vop_write = vop_generic_badop, .vop_ioctl = mfs_ioctl, - .vop_poll = vop_generic_badop, .vop_kqfilter = vop_generic_badop, .vop_revoke = vop_generic_revoke, .vop_fsync = spec_fsync, Index: sys/ufs/ufs/ufs_extern.h =================================================================== RCS file: src/sys/ufs/ufs/ufs_extern.h,v retrieving revision 1.37 diff -u -p -r1.37 ufs_extern.h --- sys/ufs/ufs/ufs_extern.h 27 Feb 2020 09:10:31 -0000 1.37 +++ sys/ufs/ufs/ufs_extern.h 25 Jun 2022 12:35:58 -0000 @@ -76,7 +76,6 @@ int ufs_readlink(void *); int ufs_remove(void *); int ufs_rename(void *); int ufs_rmdir(void *); -int ufs_poll(void *); int ufs_kqfilter(void *); int ufs_setattr(void *); int ufs_strategy(void *); Index: sys/ufs/ufs/ufs_vnops.c =================================================================== RCS file: src/sys/ufs/ufs/ufs_vnops.c,v retrieving revision 1.155 diff -u -p -r1.155 ufs_vnops.c --- sys/ufs/ufs/ufs_vnops.c 12 Dec 2021 09:14:59 -0000 1.155 +++ sys/ufs/ufs/ufs_vnops.c 25 Jun 2022 12:35:58 -0000 @@ -54,7 +54,6 @@ #include <sys/dirent.h> #include <sys/lockf.h> #include <sys/event.h> -#include <sys/poll.h> #include <sys/specdev.h> #include <sys/unistd.h> @@ -580,17 +579,6 @@ ufs_ioctl(void *v) struct vop_ioctl_args *ap = v; #endif return (ENOTTY); -} - -int -ufs_poll(void *v) -{ - struct vop_poll_args *ap = v; - - /* - * We should really check to see if I/O is possible. - */ - return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } int