diff options
author | kib <kib@FreeBSD.org> | 2009-03-06 15:35:37 +0000 |
---|---|---|
committer | kib <kib@FreeBSD.org> | 2009-03-06 15:35:37 +0000 |
commit | 84bab6f2a5f7b42982b7a5b58805d10cb9d29094 (patch) | |
tree | 2a39e9e4c6d5ba830ca005f28538680b257d514a /sys/kern/kern_conf.c | |
parent | 02189c9e63999a6f37cb1f690929e719fea7bb92 (diff) | |
download | FreeBSD-src-84bab6f2a5f7b42982b7a5b58805d10cb9d29094.zip FreeBSD-src-84bab6f2a5f7b42982b7a5b58805d10cb9d29094.tar.gz |
Extract the no_poll() and vop_nopoll() code into the common routine
poll_no_poll().
Return a poll_no_poll() result from devfs_poll_f() when
filedescriptor does not reference the live cdev, instead of ENXIO.
Noted and tested by: hps
MFC after: 1 week
Diffstat (limited to 'sys/kern/kern_conf.c')
-rw-r--r-- | sys/kern/kern_conf.c | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/sys/kern/kern_conf.c b/sys/kern/kern_conf.c index fb18b34..3ef55ea 100644 --- a/sys/kern/kern_conf.c +++ b/sys/kern/kern_conf.c @@ -312,18 +312,8 @@ no_strategy(struct bio *bp) static int no_poll(struct cdev *dev __unused, int events, struct thread *td __unused) { - /* - * Return true for read/write. If the user asked for something - * special, return POLLNVAL, so that clients have a way of - * determining reliably whether or not the extended - * functionality is present without hard-coding knowledge - * of specific filesystem implementations. - * Stay in sync with vop_nopoll(). - */ - if (events & ~POLLSTANDARD) - return (POLLNVAL); - return (events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); + return (poll_no_poll(events)); } #define no_dump (dumper_t *)enodev |