Date: Tue, 2 Jun 2020 20:37:04 +0000 (UTC) From: Alexander Motin <mav@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-12@freebsd.org Subject: svn commit: r361729 - stable/12/sys/cam/ctl Message-ID: <202006022037.052Kb4ZN050223@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Jun 2 20:37:04 2020 New Revision: 361729 URL: https://svnweb.freebsd.org/changeset/base/361729 Log: MFC r361502, r361509: 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(). Modified: stable/12/sys/cam/ctl/ctl_ha.c Directory Properties: stable/12/ (props changed) Modified: stable/12/sys/cam/ctl/ctl_ha.c ============================================================================== --- stable/12/sys/cam/ctl/ctl_ha.c Tue Jun 2 17:33:10 2020 (r361728) +++ stable/12/sys/cam/ctl/ctl_ha.c Tue Jun 2 20:37:04 2020 (r361729) @@ -258,9 +258,11 @@ ctl_ha_lclose(struct ha_softc *softc) { if (softc->ha_lso) { - SOCKBUF_LOCK(&softc->ha_lso->so_rcv); - 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?202006022037.052Kb4ZN050223>