kern/176667: commit references a PR

[dfilter service]

The following reply was made to PR kern/176667; it has been noted by GNATS.

From: dfilter at FreeBSD.ORG (dfilter service)
To: bug-followup at FreeBSD.org
Cc:  
Subject: Re: kern/176667: commit references a PR
Date: Mon, 11 Mar 2013 12:22:52 +0000 (UTC)

 Author: glebius
 Date: Mon Mar 11 12:22:44 2013
 New Revision: 248158
 URL: http://svnweb.freebsd.org/changeset/base/248158
 
 Log:
   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:
   head/sys/netinet/libalias/alias_db.c
 
 Modified: head/sys/netinet/libalias/alias_db.c
 ==============================================================================
 --- head/sys/netinet/libalias/alias_db.c	Mon Mar 11 12:14:20 2013	(r248157)
 +++ head/sys/netinet/libalias/alias_db.c	Mon Mar 11 12:22:44 2013	(r248158)
 @@ -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)
 _______________________________________________
 svn-src-all at freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe at freebsd.org"