From owner-svn-src-head@FreeBSD.ORG  Thu Sep 20 07:04:08 2012
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id EA0F91065674;
	Thu, 20 Sep 2012 07:04:08 +0000 (UTC)
	(envelope-from glebius@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D54998FC15;
	Thu, 20 Sep 2012 07:04:08 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8K748Ai063824;
	Thu, 20 Sep 2012 07:04:08 GMT (envelope-from glebius@svn.freebsd.org)
Received: (from glebius@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8K748Kg063822;
	Thu, 20 Sep 2012 07:04:08 GMT (envelope-from glebius@svn.freebsd.org)
Message-Id: <201209200704.q8K748Kg063822@svn.freebsd.org>
From: Gleb Smirnoff <glebius@FreeBSD.org>
Date: Thu, 20 Sep 2012 07:04:08 +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: r240737 - head/sys/netpfil/pf
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 20 Sep 2012 07:04:09 -0000

Author: glebius
Date: Thu Sep 20 07:04:08 2012
New Revision: 240737
URL: http://svn.freebsd.org/changeset/base/240737

Log:
  Reduce copy/paste when freeing an source node.

Modified:
  head/sys/netpfil/pf/pf.c

Modified: head/sys/netpfil/pf/pf.c
==============================================================================
--- head/sys/netpfil/pf/pf.c	Thu Sep 20 06:52:05 2012	(r240736)
+++ head/sys/netpfil/pf/pf.c	Thu Sep 20 07:04:08 2012	(r240737)
@@ -673,6 +673,11 @@ pf_remove_src_node(struct pf_src_node *s
 	PF_HASHROW_LOCK(sh);
 	LIST_REMOVE(src, entry);
 	PF_HASHROW_UNLOCK(sh);
+
+	V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
+	V_pf_status.src_nodes--;
+
+	uma_zfree(V_pf_sources_z, src);
 }
 
 /* Data storage structures initialization. */
@@ -3547,18 +3552,12 @@ csfailed:
 	if (nk != NULL)
 		uma_zfree(V_pf_state_key_z, nk);
 
-	if (sn != NULL && sn->states == 0 && sn->expire == 0) {
+	if (sn != NULL && sn->states == 0 && sn->expire == 0)
 		pf_remove_src_node(sn);
-		V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
-		V_pf_status.src_nodes--;
-		uma_zfree(V_pf_sources_z, sn);
-	}
-	if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0) {
+
+	if (nsn != sn && nsn != NULL && nsn->states == 0 && nsn->expire == 0)
 		pf_remove_src_node(nsn);
-		V_pf_status.scounters[SCNT_SRC_NODE_REMOVALS]++;
-		V_pf_status.src_nodes--;
-		uma_zfree(V_pf_sources_z, nsn);
-	}
+
 	return (PF_DROP);
 }