Skip site navigation (1)Skip section navigation (2) 
Date:      Wed, 28 Nov 2018 16:51:11 +0000 (UTC)
From:      Mark Johnston <markj@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org
Subject:   svn commit: r341151 - in stable/12/sys: kern sys
Message-ID:  <201811281651.wASGpBrd090661@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help 
Author: markj
Date: Wed Nov 28 16:51:11 2018
New Revision: 341151
URL: https://svnweb.freebsd.org/changeset/base/341151

Log:
  MFC r340733:
  Remove KN_HASKQLOCK.

Modified:
  stable/12/sys/kern/kern_event.c
  stable/12/sys/sys/event.h
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/sys/kern/kern_event.c
==============================================================================
--- stable/12/sys/kern/kern_event.c	Wed Nov 28 16:48:40 2018	(r341150)
+++ stable/12/sys/kern/kern_event.c	Wed Nov 28 16:51:11 2018	(r341151)
@@ -550,10 +550,8 @@ knote_fork(struct knlist *list, int pid)
 		 * The same as knote(), activate the event.
 		 */
 		if ((kn->kn_sfflags & NOTE_TRACK) == 0) {
-			kn->kn_status |= KN_HASKQLOCK;
 			if (kn->kn_fop->f_event(kn, NOTE_FORK))
 				KNOTE_ACTIVATE(kn, 1);
-			kn->kn_status &= ~KN_HASKQLOCK;
 			KQ_UNLOCK(kq);
 			continue;
 		}
@@ -2286,10 +2284,8 @@ knote(struct knlist *list, long hint, int lockflags)
 				KNOTE_ACTIVATE(kn, 1);
 			KQ_UNLOCK_FLUX(kq);
 		} else {
-			kn->kn_status |= KN_HASKQLOCK;
 			if (kn->kn_fop->f_event(kn, hint))
 				KNOTE_ACTIVATE(kn, 1);
-			kn->kn_status &= ~KN_HASKQLOCK;
 			KQ_UNLOCK(kq);
 		}
 	}

Modified: stable/12/sys/sys/event.h
==============================================================================
--- stable/12/sys/sys/event.h	Wed Nov 28 16:48:40 2018	(r341150)
+++ stable/12/sys/sys/event.h	Wed Nov 28 16:51:11 2018	(r341151)
@@ -294,7 +294,6 @@ struct knote {
 #define KN_DETACHED	0x08			/* knote is detached */
 #define KN_MARKER	0x20			/* ignore this knote */
 #define KN_KQUEUE	0x40			/* this knote belongs to a kq */
-#define KN_HASKQLOCK	0x80			/* for _inevent */
 #define	KN_SCAN		0x100			/* flux set in kqueue_scan() */
 	int			kn_influx;
 	int			kn_sfflags;	/* saved filter flags */

Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201811281651.wASGpBrd090661>