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

Close a detach race. Make sure all pending

Browse Source 
CCB's get canceled at device detach.

MFC after:	1 week
This commit is contained in:
Hans Petter Selasky 2012-03-01 20:10:54 +00:00
parent 3d876232e5
commit 335dd8f82f
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=232358
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/dev/usb/storage/umass.c
View File

@ -1056,6 +1056,11 @@ umass_detach(device_t dev)
#if (__FreeBSD_version >= 700037)
mtx_lock(&sc->sc_mtx);
#endif
/* cancel any leftover CCB's */
umass_cancel_ccb(sc);
umass_cam_detach_sim(sc);
#if (__FreeBSD_version >= 700037)
@ -1607,8 +1612,7 @@ umass_command_start(struct umass_softc *sc, uint8_t dir,
if (sc->sc_xfer[sc->sc_last_xfer_index]) {
usbd_transfer_start(sc->sc_xfer[sc->sc_last_xfer_index]);
} else {
ccb->ccb_h.status = CAM_TID_INVALID;
xpt_done(ccb);
umass_cancel_ccb(sc);
}
}