git: e6405c8c3733 - main - cam: Properly find the sim in the assertion in xpt_pollwait().

John Baldwin jhb at FreeBSD.org
Thu Feb 11 22:08:49 UTC 2021


The branch main has been updated by jhb:

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

commit e6405c8c37335a42a187a9d2470025b57347b1b5
Author:     John Baldwin <jhb at FreeBSD.org>
AuthorDate: 2021-02-08 23:02:14 +0000
Commit:     John Baldwin <jhb at FreeBSD.org>
CommitDate: 2021-02-11 22:06:58 +0000

    cam: Properly find the sim in the assertion in xpt_pollwait().
    
    I had missed merging this fixup into
    447b3557a9cc5f00a301be8404339f21a9a0faa8 before pushing it.
    
    Pointy hat to:  jhb
    MFC after:      2 weeks
---
 sys/cam/cam_xpt.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sys/cam/cam_xpt.c b/sys/cam/cam_xpt.c
index bae40faf50e4..9cfee80a6049 100644
--- a/sys/cam/cam_xpt.c
+++ b/sys/cam/cam_xpt.c
@@ -3229,7 +3229,8 @@ void
 xpt_pollwait(union ccb *start_ccb, uint32_t timeout)
 {
 
-	KASSERT(cam_sim_pollable(sim), ("%s: non-pollable sim", __func__));
+	KASSERT(cam_sim_pollable(start_ccb->ccb_h.path->bus->sim),
+	    ("%s: non-pollable sim", __func__));
 	while (--timeout > 0) {
 		xpt_sim_poll(start_ccb->ccb_h.path->bus->sim);
 		if ((start_ccb->ccb_h.status & CAM_STATUS_MASK)


More information about the dev-commits-src-main mailing list