Date: Tue, 10 Jan 2017 20:16:17 +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: r311892 - head/sys/cam/ctl Message-ID: <201701102016.v0AKGHTv060991@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: mav Date: Tue Jan 10 20:16:16 2017 New Revision: 311892 URL: https://svnweb.freebsd.org/changeset/base/311892 Log: Do not wait for HA thread shutdown if scheduler is stopped. This wait loop made system hang on panic instead of reboot. MFC after: 1 week Modified: head/sys/cam/ctl/ctl_ha.c Modified: head/sys/cam/ctl/ctl_ha.c ============================================================================== --- head/sys/cam/ctl/ctl_ha.c Tue Jan 10 20:15:24 2017 (r311891) +++ head/sys/cam/ctl/ctl_ha.c Tue Jan 10 20:16:16 2017 (r311892) @@ -1001,7 +1001,7 @@ ctl_ha_msg_shutdown(struct ctl_softc *ct softc->ha_shutdown = 1; softc->ha_wakeup = 1; wakeup(&softc->ha_wakeup); - while (softc->ha_shutdown < 2) { + while (softc->ha_shutdown < 2 && !SCHEDULER_STOPPED()) { msleep(&softc->ha_wakeup, &softc->ha_lock, 0, "shutdown", hz); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701102016.v0AKGHTv060991>