Date: Wed, 22 Jan 2020 06:03:45 +0000 (UTC) From: Gleb Smirnoff <glebius@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r356979 - head/sys/netinet Message-ID: <202001220603.00M63jTD032938@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: glebius Date: Wed Jan 22 06:03:45 2020 New Revision: 356979 URL: https://svnweb.freebsd.org/changeset/base/356979 Log: The network epoch changes in the TCP stack combined with old r286227, actually make removal of a PCB not needing ipi_lock in any form. The ipi_list_lock is sufficient. Modified: head/sys/netinet/in_pcb.c Modified: head/sys/netinet/in_pcb.c ============================================================================== --- head/sys/netinet/in_pcb.c Wed Jan 22 06:01:26 2020 (r356978) +++ head/sys/netinet/in_pcb.c Wed Jan 22 06:03:45 2020 (r356979) @@ -1639,13 +1639,6 @@ in_pcbfree(struct inpcb *inp) return; } -#ifdef INVARIANTS - if (pcbinfo == &V_tcbinfo) { - INP_INFO_LOCK_ASSERT(pcbinfo); - } else { - INP_INFO_WLOCK_ASSERT(pcbinfo); - } -#endif INP_WLOCK_ASSERT(inp); INP_LIST_WLOCK(pcbinfo); in_pcbremlists(inp); @@ -2640,14 +2633,6 @@ static void in_pcbremlists(struct inpcb *inp) { struct inpcbinfo *pcbinfo = inp->inp_pcbinfo; - -#ifdef INVARIANTS - if (pcbinfo == &V_tcbinfo) { - NET_EPOCH_ASSERT(); - } else { - INP_INFO_WLOCK_ASSERT(pcbinfo); - } -#endif INP_WLOCK_ASSERT(inp); INP_LIST_WLOCK_ASSERT(pcbinfo);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202001220603.00M63jTD032938>