From owner-svn-src-stable-7@FreeBSD.ORG Sat Nov 27 03:46:32 2010 Return-Path: Delivered-To: svn-src-stable-7@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id B1E25106566C; Sat, 27 Nov 2010 03:46:32 +0000 (UTC) (envelope-from lstewart@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 9EE138FC0C; Sat, 27 Nov 2010 03:46:32 +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 oAR3kWCd010702; Sat, 27 Nov 2010 03:46:32 GMT (envelope-from lstewart@svn.freebsd.org) Received: (from lstewart@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id oAR3kW2R010700; Sat, 27 Nov 2010 03:46:32 GMT (envelope-from lstewart@svn.freebsd.org) Message-Id: <201011270346.oAR3kW2R010700@svn.freebsd.org> From: Lawrence Stewart Date: Sat, 27 Nov 2010 03:46:32 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org X-SVN-Group: stable-7 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r215929 - stable/7/sys/netinet X-BeenThere: svn-src-stable-7@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for only the 7-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Nov 2010 03:46:32 -0000 Author: lstewart Date: Sat Nov 27 03:46:32 2010 New Revision: 215929 URL: http://svn.freebsd.org/changeset/base/215929 Log: MFC r215553: Fix a minor code redundancy nit. Modified: stable/7/sys/netinet/siftr.c Directory Properties: stable/7/sys/ (props changed) stable/7/sys/cddl/contrib/opensolaris/ (props changed) stable/7/sys/contrib/dev/acpica/ (props changed) stable/7/sys/contrib/pf/ (props changed) Modified: stable/7/sys/netinet/siftr.c ============================================================================== --- stable/7/sys/netinet/siftr.c Sat Nov 27 03:23:40 2010 (r215928) +++ stable/7/sys/netinet/siftr.c Sat Nov 27 03:46:32 2010 (r215929) @@ -742,14 +742,12 @@ siftr_findinpcb(int ipver, struct ip *ip ss->nskip_in_inpcb++; else ss->nskip_out_inpcb++; - - INP_INFO_RUNLOCK(&V_tcbinfo); } else { /* Acquire the inpcb lock. */ INP_UNLOCK_ASSERT(inp); INP_RLOCK(inp); - INP_INFO_RUNLOCK(&V_tcbinfo); } + INP_INFO_RUNLOCK(&V_tcbinfo); return (inp); }