d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make sure we do locking if we call isp_intr.

Browse Source 
Make sure we enter Giant for now if we call into cam for completion.
This commit is contained in:
Matt Jacob 2000-12-29 19:06:32 +00:00
parent d0d78e1303
commit c40e096ed6
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=70487
1 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys/dev/isp/isp_freebsd.c
View File

@ -1331,7 +1331,10 @@ isp_cam_async(void *cbarg, u_int32_t code, struct cam_path *path, void *arg)
static void
isp_poll(struct cam_sim *sim)
{
isp_intr((struct ispsoftc *) cam_sim_softc(sim));
struct ispsoftc *isp = cam_sim_softc(sim);
ISP_LOCK(isp);
(void) isp_intr(isp);
ISP_UNLOCK(isp);
}
static void
@ -1533,7 +1536,9 @@ isp_action(struct cam_sim *sim, union ccb *ccb)
xpt_done(ccb);
break;
case CMD_COMPLETE:
ISP_LOCK(isp);
isp_done((struct ccb_scsiio *) ccb);
ISP_UNLOCK(isp);
break;
default:
isp_prt(isp, ISP_LOGERR,
@ -1982,7 +1987,15 @@ isp_done(struct ccb_scsiio *sccb)
"finished command on borrowed time");
}
XS_CMD_S_CLEAR(sccb);
ISP_UNLOCK(isp);
#ifdef ISP_SMPLOCK
mtx_enter(&Giant, MTX_DEF);
xpt_done((union ccb *) sccb);
mtx_exit(&Giant, MTX_DEF);
#else
xpt_done((union ccb *) sccb);
#endif
ISP_LOCK(isp);
}
}