From 2e4f8220e8a14671a715c34ab3bdbb9dcee3ab06 Mon Sep 17 00:00:00 2001 From: Mateusz Guzik Date: Thu, 30 Jul 2020 15:48:56 +0000 Subject: [PATCH] vfs: fold poll_no_poll into vop_nopoll The logic was almost completely present in vop_stdpoll anyway. --- sys/kern/vfs_default.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sys/kern/vfs_default.c b/sys/kern/vfs_default.c index 9dc4e714ed7..f67bc9bf3ef 100644 --- a/sys/kern/vfs_default.c +++ b/sys/kern/vfs_default.c @@ -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)); } /*