Author: mav
Date: Tue May 26 15:08:35 2020
New Revision: 361509
URL: https://svnweb.freebsd.org/changeset/base/361509
Log:
Fix fallout of r319722 in CTL HA.
ha_lso is a listening socket (unless bind() has failed), so should use
solisten_upcall_set(NULL, NULL), not soupcall_clear().
MFC after: 1 week
Sponsored by: iXsystems, Inc.
Modified:
head/sys/cam/ctl/ctl_ha.c
Modified: head/sys/cam/ctl/ctl_ha.c
==============================================================================
--- head/sys/cam/ctl/ctl_ha.c Tue May 26 15:04:49 2020 (r361508)
+++ head/sys/cam/ctl/ctl_ha.c Tue May 26 15:08:35 2020 (r361509)
@@ -196,10 +196,11 @@ ctl_ha_lclose(struct ha_softc *softc)
{
if (softc->ha_lso) {
- SOCKBUF_LOCK(&softc->ha_lso->so_rcv);
- if (softc->ha_lso->so_rcv.sb_upcall != NULL)
- soupcall_clear(softc->ha_lso, SO_RCV);
- SOCKBUF_UNLOCK(&softc->ha_lso->so_rcv);
+ if (SOLISTENING(softc->ha_lso)) {
+ SOLISTEN_LOCK(softc->ha_lso);
+ solisten_upcall_set(softc->ha_lso, NULL, NULL);
+ SOLISTEN_UNLOCK(softc->ha_lso);
+ }
soclose(softc->ha_lso);
softc->ha_lso = NULL;
}
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
