From owner-svn-src-stable@FreeBSD.ORG  Thu Jun  3 09:06:51 2010
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 15EC91065670;
	Thu,  3 Jun 2010 09:06:51 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 04F968FC13;
	Thu,  3 Jun 2010 09:06:51 +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 o5396oQL027019;
	Thu, 3 Jun 2010 09:06:50 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5396oR8027017;
	Thu, 3 Jun 2010 09:06:50 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <201006030906.o5396oR8027017@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Thu, 3 Jun 2010 09:06:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org
X-SVN-Group: stable-8
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208768 - stable/8/sys/netinet
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
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/listinfo/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: Thu, 03 Jun 2010 09:06:51 -0000

Author: rwatson
Date: Thu Jun  3 09:06:50 2010
New Revision: 208768
URL: http://svn.freebsd.org/changeset/base/208768

Log:
  Merge r204830 from head to stable/8
  
    Locking the tcbinfo structure should not be necessary in tcp_timer_delack(),
    so don't.
  
    Reviewed by:    bz
    Sponsored by:   Juniper Networks
  
  Approved by:	re (kib)

Modified:
  stable/8/sys/netinet/tcp_timer.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/netinet/tcp_timer.c
==============================================================================
--- stable/8/sys/netinet/tcp_timer.c	Thu Jun  3 09:02:53 2010	(r208767)
+++ stable/8/sys/netinet/tcp_timer.c	Thu Jun  3 09:06:50 2010	(r208768)
@@ -162,7 +162,6 @@ tcp_timer_delack(void *xtp)
 	struct inpcb *inp;
 	CURVNET_SET(tp->t_vnet);
 
-	INP_INFO_RLOCK(&V_tcbinfo);
 	inp = tp->t_inpcb;
 	/*
 	 * XXXRW: While this assert is in fact correct, bugs in the tcpcb
@@ -173,12 +172,10 @@ tcp_timer_delack(void *xtp)
 	 */
 	if (inp == NULL) {
 		tcp_timer_race++;
-		INP_INFO_RUNLOCK(&V_tcbinfo);
 		CURVNET_RESTORE();
 		return;
 	}
 	INP_WLOCK(inp);
-	INP_INFO_RUNLOCK(&V_tcbinfo);
 	if ((inp->inp_flags & INP_DROPPED) || callout_pending(&tp->t_timers->tt_delack)
 	    || !callout_active(&tp->t_timers->tt_delack)) {
 		INP_WUNLOCK(inp);