Date: Thu, 30 Jul 2020 15:48:56 +0000 (UTC) From: Mateusz Guzik <mjg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r363707 - head/sys/kern Message-ID: <202007301548.06UFmuLJ099897@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mjg Date: Thu Jul 30 15:48:56 2020 New Revision: 363707 URL: https://svnweb.freebsd.org/changeset/base/363707 Log: vfs: fold poll_no_poll into vop_nopoll The logic was almost completely present in vop_stdpoll anyway. Modified: head/sys/kern/vfs_default.c Modified: head/sys/kern/vfs_default.c ============================================================================== --- head/sys/kern/vfs_default.c Thu Jul 30 15:47:41 2020 (r363706) +++ head/sys/kern/vfs_default.c Thu Jul 30 15:48:56 2020 (r363707) @@ -616,7 +616,9 @@ vop_nopoll(ap) } */ *ap; { - return (poll_no_poll(ap->a_events)); + if (ap->a_events & ~POLLSTANDARD) + return (POLLNVAL); + return (ap->a_events & (POLLIN | POLLOUT | POLLRDNORM | POLLWRNORM)); } /*
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202007301548.06UFmuLJ099897>