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

Do not pretend to have autosense data when no such data is available.

Browse Source 
Make umass return an error code if SCSI sense retrieval request
has failed. Make sure scsi_error_action honors SF_NO_RETRY and
SF_NO_RECOVERY in all cases, even if it cannot parse sense bytes.

Reviewed by: hselasky (umass), scottl (cam)
This commit is contained in:
kan 2013-01-19 03:19:39 +00:00
parent c3e3cd888a
commit 404c93b661
2 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
sys/cam/scsi/scsi_all.c
View File

@ -3071,16 +3071,15 @@ scsi_error_action(struct ccb_scsiio *csio, struct scsi_inquiry_data *inq_data,
SSQ_PRINT_SENSE;
}
}
if ((action & SS_MASK) >= SS_START &&
(sense_flags & SF_NO_RECOVERY)) {
action &= ~SS_MASK;
action |= SS_FAIL;
} else if ((action & SS_MASK) == SS_RETRY &&
(sense_flags & SF_NO_RETRY)) {
action &= ~SS_MASK;
action |= SS_FAIL;
}
}
if ((action & SS_MASK) >= SS_START &&
(sense_flags & SF_NO_RECOVERY)) {
action &= ~SS_MASK;
action |= SS_FAIL;
} else if ((action & SS_MASK) == SS_RETRY &&
(sense_flags & SF_NO_RETRY)) {
action &= ~SS_MASK;
action |= SS_FAIL;
}
if ((sense_flags & SF_PRINT_ALWAYS) != 0)
action |= SSQ_PRINT_SENSE;

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

@ -2602,9 +2602,13 @@ umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue,
}
} else {
xpt_freeze_devq(ccb->ccb_h.path, 1);
ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR
| CAM_AUTOSNS_VALID | CAM_DEV_QFRZN;
ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
if (key >= 0) {
ccb->ccb_h.status = CAM_SCSI_STATUS_ERROR
| CAM_AUTOSNS_VALID | CAM_DEV_QFRZN;
ccb->csio.scsi_status = SCSI_STATUS_CHECK_COND;
} else
ccb->ccb_h.status = CAM_AUTOSENSE_FAIL
| CAM_DEV_QFRZN;
}
xpt_done(ccb);
break;