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.
This commit is contained in:
Gleb Smirnoff 2020-01-22 06:03:45 +00:00
parent 7669c586da
commit 5c722e2ad3

View File

@ -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);
@ -2641,14 +2634,6 @@ 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);