Date: Tue, 26 May 2020 15:08:35 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r361509 - head/sys/cam/ctl Message-ID: <202005261508.04QF8Z7i045488@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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; }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202005261508.04QF8Z7i045488>