Author: rwatson
Date: Sun Mar 7 14:23:44 2010
New Revision: 204830
URL: http://svn.freebsd.org/changeset/base/204830
Log:
Locking the tcbinfo structure should not be necessary in tcp_timer_delack(),
so don't.
MFC after: 1 week
Reviewed by: bz
Sponsored by: Juniper Networks
Modified:
head/sys/netinet/tcp_timer.c
Modified: head/sys/netinet/tcp_timer.c
==============================================================================
--- head/sys/netinet/tcp_timer.c Sun Mar 7 14:13:59 2010
(r204829)
+++ head/sys/netinet/tcp_timer.c Sun Mar 7 14:23:44 2010
(r204830)
@@ -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);
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"
