svn commit: r208768 - stable/8/sys/netinet

[Robert Watson]

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);