From owner-cvs-src@FreeBSD.ORG  Sat Apr 16 18:33:13 2005
Return-Path: <owner-cvs-src@FreeBSD.ORG>
Delivered-To: cvs-src@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP
	id 9867416A4CE; Sat, 16 Apr 2005 18:33:13 +0000 (GMT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP
	id 8334A43D2F; Sat, 16 Apr 2005 18:33:13 +0000 (GMT)
	(envelope-from rwatson@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j3GIXDss088077;
	Sat, 16 Apr 2005 18:33:13 GMT
	(envelope-from rwatson@repoman.freebsd.org)
Received: (from rwatson@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j3GIXDwm088076;
	Sat, 16 Apr 2005 18:33:13 GMT
	(envelope-from rwatson)
Message-Id: <200504161833.j3GIXDwm088076@repoman.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 16 Apr 2005 18:33:13 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org,
	cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Subject: cvs commit: src/sys/kern kern_mac.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 16 Apr 2005 18:33:13 -0000

rwatson     2005-04-16 18:33:13 UTC

  FreeBSD src repository

  Modified files:
    sys/kern             kern_mac.c 
  Log:
  In mac_get_fd(), remove unconditional acquisition of Giant around copying
  of the socket label to thread-local storage, and replace it with
  conditional acquisition based on debug.mpsafenet.  Acquire the socket
  lock around the copy operation.
  
  In mac_set_fd(), replace the unconditional acquisition of Giant with
  the conditional acquisition of Giant based on debug.mpsafenet.  The socket
  lock is acquired in mac_socket_label_set() so doesn't have to be
  acquired here.
  
  Obtained from:  TrustedBSD Project
  Sponsored by:   SPAWAR, SPARTA
  
  Revision  Changes    Path
  1.116     +7 -9      src/sys/kern/kern_mac.c