The branch main has been updated by mav:

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

commit c67a2909a629db138227993e1093e66bb6c00af5
Author:     Alexander Motin <m...@freebsd.org>
AuthorDate: 2021-02-18 21:22:01 +0000
Commit:     Alexander Motin <m...@freebsd.org>
CommitDate: 2021-02-18 21:31:38 +0000

    Move XPT_IMMEDIATE_NOTIFY handling out of periph lock.
    
    It is a rare, but still better to not have lock dependencies.
    
    MFC after:      1 month
---
 sys/cam/ctl/scsi_ctl.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/cam/ctl/scsi_ctl.c b/sys/cam/ctl/scsi_ctl.c
index 074ac4cd1894..34c3ce7ad923 100644
--- a/sys/cam/ctl/scsi_ctl.c
+++ b/sys/cam/ctl/scsi_ctl.c
@@ -1491,6 +1491,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
                        ctlfe_free_ccb(periph, done_ccb);
                        goto out;
                }
+               mtx_unlock(mtx);
                if (send_ctl_io != 0) {
                        ctl_queue(io);
                } else {
@@ -1498,7 +1499,7 @@ ctlfedone(struct cam_periph *periph, union ccb *done_ccb)
                        done_ccb->ccb_h.func_code = XPT_NOTIFY_ACKNOWLEDGE;
                        xpt_action(done_ccb);
                }
-               break;
+               return;
        }
        case XPT_NOTIFY_ACKNOWLEDGE:
                /* Queue this back down to the SIM as an immediate notify. */
_______________________________________________
dev-commits-src-main@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/dev-commits-src-main
To unsubscribe, send any mail to "dev-commits-src-main-unsubscr...@freebsd.org"

Reply via email to