git: 9d61fd084996 - main - ctl_ha: don't shutdown threads if scheduler is stopped

[Mitchell Horne]

The branch main has been updated by mhorne:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=9d61fd08499609a2c95d1c66f97587932b446f06

commit 9d61fd08499609a2c95d1c66f97587932b446f06
Author:     Mitchell Horne <mho...@freebsd.org>
AuthorDate: 2023-11-23 15:25:54 +0000
Commit:     Mitchell Horne <mho...@freebsd.org>
CommitDate: 2023-11-23 16:07:42 +0000

    ctl_ha: don't shutdown threads if scheduler is stopped
    
    In this case, just return.
    
    Reviewed by:    markj
    MFC after:      1 week
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D42341
---
 sys/cam/ctl/ctl_ha.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/sys/cam/ctl/ctl_ha.c b/sys/cam/ctl/ctl_ha.c
index 181f42640cce..0828c46c8863 100644
--- a/sys/cam/ctl/ctl_ha.c
+++ b/sys/cam/ctl/ctl_ha.c
@@ -909,13 +909,16 @@ ctl_ha_msg_shutdown(struct ctl_softc *ctl_softc)
 {
        struct ha_softc *softc = &ha_softc;
 
+       if (SCHEDULER_STOPPED())
+               return;
+
        /* Disconnect and shutdown threads. */
        mtx_lock(&softc->ha_lock);
        if (softc->ha_shutdown < 2) {
                softc->ha_shutdown = 1;
                softc->ha_wakeup = 1;
                wakeup(&softc->ha_wakeup);
-               while (softc->ha_shutdown < 2 && !SCHEDULER_STOPPED()) {
+               while (softc->ha_shutdown < 2) {
                        msleep(&softc->ha_wakeup, &softc->ha_lock, 0,
                            "shutdown", hz);
                }