From owner-svn-src-stable@FreeBSD.ORG  Mon Jun 24 09:23:25 2013
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
 by hub.freebsd.org (Postfix) with ESMTP id 522BEE15;
 Mon, 24 Jun 2013 09:23:25 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2BA54188E;
 Mon, 24 Jun 2013 09:23:25 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5O9NPgI011563;
 Mon, 24 Jun 2013 09:23:25 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5O9NPRL011562;
 Mon, 24 Jun 2013 09:23:25 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201306240923.r5O9NPRL011562@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Mon, 24 Jun 2013 09:23:25 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
Subject: svn commit: r252150 - stable/9/sys/netinet/libalias
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
 <svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
 <mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 24 Jun 2013 09:23:25 -0000

Author: glebius
Date: Mon Jun 24 09:23:24 2013
New Revision: 252150
URL: http://svnweb.freebsd.org/changeset/base/252150

Log:
  Merge r248158:
    Remove LIBALIAS_LOCK_ASSERT(), including a couple with an uninitialzed
    argument, in code that isn't compiled in kernel.
  
    PR:           kern/176667
    Sponsored by: Nginx, Inc.

Modified:
  stable/9/sys/netinet/libalias/alias_db.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/netinet/libalias/alias_db.c
==============================================================================
--- stable/9/sys/netinet/libalias/alias_db.c	Mon Jun 24 09:21:55 2013	(r252149)
+++ stable/9/sys/netinet/libalias/alias_db.c	Mon Jun 24 09:23:24 2013	(r252150)
@@ -2729,7 +2729,6 @@ static void
 InitPunchFW(struct libalias *la)
 {
 
-	LIBALIAS_LOCK_ASSERT(la);
 	la->fireWallField = malloc(la->fireWallNumNums);
 	if (la->fireWallField) {
 		memset(la->fireWallField, 0, la->fireWallNumNums);
@@ -2745,7 +2744,6 @@ static void
 UninitPunchFW(struct libalias *la)
 {
 
-	LIBALIAS_LOCK_ASSERT(la);
 	ClearAllFWHoles(la);
 	if (la->fireWallFD >= 0)
 		close(la->fireWallFD);
@@ -2765,7 +2763,6 @@ PunchFWHole(struct alias_link *lnk)
 	struct ip_fw rule;	/* On-the-fly built rule */
 	int fwhole;		/* Where to punch hole */
 
-	LIBALIAS_LOCK_ASSERT(la);
 	la = lnk->la;
 
 /* Don't do anything unless we are asked to */
@@ -2839,7 +2836,6 @@ ClearFWHole(struct alias_link *lnk)
 {
 	struct libalias *la;
 
-	LIBALIAS_LOCK_ASSERT(la);
 	la = lnk->la;
 	if (lnk->link_type == LINK_TCP) {
 		int fwhole = lnk->data.tcp->fwhole;	/* Where is the firewall
@@ -2864,7 +2860,6 @@ ClearAllFWHoles(struct libalias *la)
 	struct ip_fw rule;	/* On-the-fly built rule */
 	int i;
 
-	LIBALIAS_LOCK_ASSERT(la);
 	if (la->fireWallFD < 0)
 		return;
 
@@ -2878,7 +2873,7 @@ ClearAllFWHoles(struct libalias *la)
 	memset(la->fireWallField, 0, la->fireWallNumNums);
 }
 
-#endif
+#endif /* !NO_FW_PUNCH */
 
 void
 LibAliasSetFWBase(struct libalias *la, unsigned int base, unsigned int num)