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

Require and enforce that dareprobe() has to be called with the periph lock held.

Browse Source 
Reviewed by: scottl, ken
Differential Revision: https://reviews.freebsd.org/D22295
This commit is contained in:
Warner Losh 2019-11-11 17:36:47 +00:00
parent fb6ea34a3a
commit fe95666bab
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/cam/scsi/scsi_da.c
View File

@ -2133,8 +2133,8 @@ daasync(void *callback_arg, u_int32_t code,
"Capacity data has changed\n");
cam_periph_lock(periph);
softc->flags &= ~DA_FLAG_PROBED;
cam_periph_unlock(periph);
dareprobe(periph);
cam_periph_unlock(periph);
} else if (asc == 0x28 && ascq == 0x00) {
cam_periph_lock(periph);
softc->flags &= ~DA_FLAG_PROBED;
@ -2145,8 +2145,8 @@ daasync(void *callback_arg, u_int32_t code,
"INQUIRY data has changed\n");
cam_periph_lock(periph);
softc->flags &= ~DA_FLAG_PROBED;
cam_periph_unlock(periph);
dareprobe(periph);
cam_periph_unlock(periph);
}
}
break;
@ -5827,6 +5827,8 @@ dareprobe(struct cam_periph *periph)
softc = (struct da_softc *)periph->softc;
cam_periph_assert(periph, MA_OWNED);
/* Probe in progress; don't interfere. */
if (softc->state != DA_STATE_NORMAL)
return;