[src/netbsd-9]: src/sys/kern Apply additional patch, requested by jdolecek in...

[martin <martin%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/539fa28a2a9c
branches:  netbsd-9
changeset: 951912:539fa28a2a9c
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Feb 07 16:42:41 2021 +0000

description:
Apply additional patch, requested by jdolecek in ticket #1191:

        sys/kern/kern_event.c                           1.110-1.115 (via patch)

Fix merge botch for the EV_ONESHOT branch.

diffstat:

 sys/kern/kern_event.c |  6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diffs (30 lines):

diff -r 3b982c93504b -r 539fa28a2a9c sys/kern/kern_event.c
--- a/sys/kern/kern_event.c     Sun Feb 07 13:53:19 2021 +0000
+++ b/sys/kern/kern_event.c     Sun Feb 07 16:42:41 2021 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: kern_event.c,v 1.104.4.1 2021/02/04 16:57:25 martin Exp $      */
+/*     $NetBSD: kern_event.c,v 1.104.4.2 2021/02/07 16:42:41 martin Exp $      */
 
 /*-
  * Copyright (c) 2008, 2009 The NetBSD Foundation, Inc.
@@ -58,7 +58,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.104.4.1 2021/02/04 16:57:25 martin Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_event.c,v 1.104.4.2 2021/02/07 16:42:41 martin Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -1399,9 +1399,11 @@
                /* XXXAD should be got from f_event if !oneshot. */
                *kevp++ = kn->kn_kevent;
                nkev++;
+               influx = 1;
                if (kn->kn_flags & EV_ONESHOT) {
                        /* delete ONESHOT events after retrieval */
                        kn->kn_status &= ~KN_BUSY;
+                       kq->kq_count--;
                        mutex_spin_exit(&kq->kq_lock);
                        knote_detach(kn, fdp, true);
                        mutex_enter(&fdp->fd_lock);