svn commit: r363707 - head/sys/kern

[Mateusz Guzik]

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));
 }
 
 /*