From owner-svn-src-all@FreeBSD.ORG  Sat Jun 20 17:28:38 2009
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B0E5A106566C;
	Sat, 20 Jun 2009 17:28:38 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 9F0548FC16;
	Sat, 20 Jun 2009 17:28:38 +0000 (UTC)
	(envelope-from rwatson@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 n5KHSc9W082208;
	Sat, 20 Jun 2009 17:28:38 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5KHSchr082206;
	Sat, 20 Jun 2009 17:28:38 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200906201728.n5KHSchr082206@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 20 Jun 2009 17:28:38 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r194543 - head/sys/netatalk
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 20 Jun 2009 17:28:39 -0000

Author: rwatson
Date: Sat Jun 20 17:28:38 2009
New Revision: 194543
URL: http://svn.freebsd.org/changeset/base/194543

Log:
  Don't lock sockets around calls to mac_socket_create_mbuf() -- policies
  are now expected to acquire the socket lock if they require them.
  
  Obtained from:	TrustedBSD Project

Modified:
  head/sys/netatalk/ddp_output.c

Modified: head/sys/netatalk/ddp_output.c
==============================================================================
--- head/sys/netatalk/ddp_output.c	Sat Jun 20 17:16:29 2009	(r194542)
+++ head/sys/netatalk/ddp_output.c	Sat Jun 20 17:28:38 2009	(r194543)
@@ -51,9 +51,7 @@ ddp_output(struct mbuf *m, struct socket
 	struct ddpcb *ddp = sotoddpcb(so);
 
 #ifdef MAC
-	SOCK_LOCK(so);
 	mac_socket_create_mbuf(so, m);
-	SOCK_UNLOCK(so);
 #endif
 
 	M_PREPEND(m, sizeof(struct ddpehdr), M_DONTWAIT);