From owner-svn-src-all@FreeBSD.ORG  Wed Aug 12 10:44:14 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 2D6EC106566B;
	Wed, 12 Aug 2009 10:44:14 +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 1D22D8FC16;
	Wed, 12 Aug 2009 10:44:14 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n7CAiEhk059177;
	Wed, 12 Aug 2009 10:44:14 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n7CAiDxP059175;
	Wed, 12 Aug 2009 10:44:13 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200908121044.n7CAiDxP059175@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Wed, 12 Aug 2009 10:44:13 +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: r196121 - 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: Wed, 12 Aug 2009 10:44:14 -0000

Author: rwatson
Date: Wed Aug 12 10:44:13 2009
New Revision: 196121
URL: http://svn.freebsd.org/changeset/base/196121

Log:
  Reverse misordered unlock and lock in at_control for netatalk phase I
  addresses.
  
  Submitted by:	Russell Cattelan <cattelan at thebarn.com>
  Approved by:	re (kib)

Modified:
  head/sys/netatalk/at_control.c

Modified: head/sys/netatalk/at_control.c
==============================================================================
--- head/sys/netatalk/at_control.c	Wed Aug 12 10:41:37 2009	(r196120)
+++ head/sys/netatalk/at_control.c	Wed Aug 12 10:44:13 2009	(r196121)
@@ -276,7 +276,7 @@ at_control(struct socket *so, u_long cmd
 			 * If the request is specifying phase 1, then
 			 * only look at a phase one address
 			 */
-			AT_IFADDR_RUNLOCK();
+			AT_IFADDR_RLOCK();
 			for (oaa = aa; aa; aa = TAILQ_NEXT(aa, aa_link)) {
 				if (aa->aa_ifp == ifp &&
 				    (aa->aa_flags & AFA_PHASE2) == 0)
@@ -286,7 +286,7 @@ at_control(struct socket *so, u_long cmd
 				ifa_free(&oaa->aa_ifa);
 			if (aa != NULL && oaa != aa)
 				ifa_ref(&aa->aa_ifa);
-			AT_IFADDR_RLOCK();
+			AT_IFADDR_RUNLOCK();
 		} else {
 			struct at_ifaddr *oaa;