svn commit: r186671 - user/kmacy/HEAD_fast_net/sys/kern

[Kip Macy]

Author: kmacy
Date: Thu Jan  1 03:08:07 2009
New Revision: 186671
URL: http://svn.freebsd.org/changeset/base/186671

Log:
  fix lock acquisition

Modified:
  user/kmacy/HEAD_fast_net/sys/kern/kern_event.c

Modified: user/kmacy/HEAD_fast_net/sys/kern/kern_event.c
==============================================================================
--- user/kmacy/HEAD_fast_net/sys/kern/kern_event.c	Thu Jan  1 02:29:57 2009	(r186670)
+++ user/kmacy/HEAD_fast_net/sys/kern/kern_event.c	Thu Jan  1 03:08:07 2009	(r186671)
@@ -1672,7 +1672,6 @@ knote(struct knlist *list, long hint)
 	list->kl_unlock(list->kl_lockarg); 
 }
 
-
 /*
  * add a knote to a knlist
  */
@@ -1684,12 +1683,10 @@ knlist_add(struct knlist *knl, struct kn
 	KASSERT((kn->kn_status & (KN_INFLUX|KN_DETACHED)) ==
 	    (KN_INFLUX|KN_DETACHED), ("knote not KN_INFLUX and KN_DETACHED"));
 	if (!islocked) {
-		struct knlist *list = kn->kn_knlist;
-
-		if (list->kl_lock != knlist_mtx_lock)
-			list->kl_lock(list->kl_lockarg);
+		if (knl->kl_lock != knlist_mtx_lock)
+			knl->kl_lock(knl->kl_lockarg);
 		else	
-			mtx_lock((struct mtx *)list->kl_lockarg);
+			mtx_lock((struct mtx *)knl->kl_lockarg);
 	}
 	SLIST_INSERT_HEAD(&knl->kl_list, kn, kn_selnext);
 	if (!islocked)