From owner-svn-src-user@FreeBSD.ORG  Thu Jan  1 03:08:07 2009
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id A75CB1065674;
	Thu,  1 Jan 2009 03:08:07 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 961E98FC17;
	Thu,  1 Jan 2009 03:08:07 +0000 (UTC)
	(envelope-from kmacy@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n01387Sn042542;
	Thu, 1 Jan 2009 03:08:07 GMT (envelope-from kmacy@svn.freebsd.org)
Received: (from kmacy@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n01387Wr042541;
	Thu, 1 Jan 2009 03:08:07 GMT (envelope-from kmacy@svn.freebsd.org)
Message-Id: <200901010308.n01387Wr042541@svn.freebsd.org>
From: Kip Macy <kmacy@FreeBSD.org>
Date: Thu, 1 Jan 2009 03:08:07 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r186671 - user/kmacy/HEAD_fast_net/sys/kern
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental &quot; user&quot;
	src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
	<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 01 Jan 2009 03:08:07 -0000

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)