aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGleb Smirnoff <glebius@FreeBSD.org>2021-04-16 21:39:19 +0000
committerGleb Smirnoff <glebius@FreeBSD.org>2021-04-20 17:02:20 +0000
commit7b5053ce2296e0fd96f162e308beb344b4ee654c (patch)
tree59bb07428b693cf2c9a7d39eae8006e6d4497b0a
parenta649f1f6fd7a098ab173a69fe87916c04a8c6f8d (diff)
downloadsrc-7b5053ce2296e0fd96f162e308beb344b4ee654c.tar.gz
src-7b5053ce2296e0fd96f162e308beb344b4ee654c.zip
tcp_input: remove comments and assertions about tcpbinfo locking
They aren't valid since d40c0d47cd2.
-rw-r--r--sys/netinet/tcp_input.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 8592f3313725..cac67024705e 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -984,16 +984,6 @@ findpcb:
* or duplicate segments arriving late. If this segment was a
* legitimate new connection attempt, the old INPCB gets removed and
* we can try again to find a listening socket.
- *
- * At this point, due to earlier optimism, we may hold only an inpcb
- * lock, and not the inpcbinfo write lock. If so, we need to try to
- * acquire it, or if that fails, acquire a reference on the inpcb,
- * drop all locks, acquire a global write lock, and then re-acquire
- * the inpcb lock. We may at that point discover that another thread
- * has tried to free the inpcb, in which case we need to loop back
- * and try to find a new inpcb to deliver to.
- *
- * XXXRW: It may be time to rethink timewait locking.
*/
if (inp->inp_flags & INP_TIMEWAIT) {
tcp_dooptions(&to, optp, optlen,
@@ -1361,7 +1351,6 @@ tfo_socket_result:
* Entry added to syncache and mbuf consumed.
* Only the listen socket is unlocked by syncache_add().
*/
- INP_INFO_WUNLOCK_ASSERT(&V_tcbinfo);
return (IPPROTO_DONE);
} else if (tp->t_state == TCPS_LISTEN) {
/*
@@ -1414,7 +1403,6 @@ dropunlock:
INP_UNLOCK(inp);
drop:
- INP_INFO_WUNLOCK_ASSERT(&V_tcbinfo);
if (s != NULL)
free(s, M_TCPLOG);
if (m != NULL)