From owner-cvs-all@FreeBSD.ORG  Mon Jul  3 20:02:07 2006
Return-Path: <owner-cvs-all@FreeBSD.ORG>
X-Original-To: cvs-all@FreeBSD.org
Delivered-To: cvs-all@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 4299716A50A;
	Mon,  3 Jul 2006 20:02:07 +0000 (UTC)
	(envelope-from csjp@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id E5E6C43D48;
	Mon,  3 Jul 2006 20:02:06 +0000 (GMT)
	(envelope-from csjp@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k63K26G8030851;
	Mon, 3 Jul 2006 20:02:06 GMT (envelope-from csjp@repoman.freebsd.org)
Received: (from csjp@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k63K26U3030850;
	Mon, 3 Jul 2006 20:02:06 GMT (envelope-from csjp)
Message-Id: <200607032002.k63K26U3030850@repoman.freebsd.org>
From: "Christian S.J. Peron" <csjp@FreeBSD.org>
Date: Mon, 3 Jul 2006 20:02:06 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/sys/net bpf.c
X-BeenThere: cvs-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the entire tree <cvs-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-all>
List-Post: <mailto:cvs-all@freebsd.org>
List-Help: <mailto:cvs-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-all>,
	<mailto:cvs-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 03 Jul 2006 20:02:07 -0000

csjp        2006-07-03 20:02:06 UTC

  FreeBSD src repository

  Modified files:
    sys/net              bpf.c 
  Log:
  Adjust descriptor locking to tell the kqueue subsystem that our descriptor is
  already locked. The reason to do this is to avoid two lock+unlock operations
  in a row. We need the lock here to serialize access to bd_pid for stats
  collection purposes.
  
  Drop the locks all together on detach, as they will be picked up by
  knlist_remove.
  
  This should fix a failed locking assertion when kqueue is being used with bpf
  descriptors.
  
  Discussed with: jmg
  
  Revision  Changes    Path
  1.169     +1 -3      src/sys/net/bpf.c