Author: mav
Date: Fri Apr 13 00:29:42 2018
New Revision: 332461
URL: https://svnweb.freebsd.org/changeset/base/332461
Log:
MFC r332145: Do not fail devices just for errors in descriptor format.
Sponsored by: iXsystems, Inc.
Modified:
stable/11/sys/cam/scsi/scsi_cd.c
stable/11/sys/cam/scsi/scsi_da.c
Directory Properties:
stable/11/ (props changed)
Modified: stable/11/sys/cam/scsi/scsi_cd.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_cd.c Fri Apr 13 00:25:53 2018
(r332460)
+++ stable/11/sys/cam/scsi/scsi_cd.c Fri Apr 13 00:29:42 2018
(r332461)
@@ -1129,7 +1129,8 @@ cddone(struct cam_periph *periph, union ccb *done_ccb)
* supported" (0x25) error.
*/
if ((have_sense) && (asc != 0x25)
- && (error_code == SSD_CURRENT_ERROR)) {
+ && (error_code == SSD_CURRENT_ERROR
+ || error_code == SSD_DESC_CURRENT_ERROR)) {
const char *sense_key_desc;
const char *asc_desc;
Modified: stable/11/sys/cam/scsi/scsi_da.c
==============================================================================
--- stable/11/sys/cam/scsi/scsi_da.c Fri Apr 13 00:25:53 2018
(r332460)
+++ stable/11/sys/cam/scsi/scsi_da.c Fri Apr 13 00:29:42 2018
(r332461)
@@ -4468,7 +4468,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
(((csio->ccb_h.status & CAM_STATUS_MASK) ==
CAM_REQ_INVALID) ||
((have_sense) &&
- (error_code == SSD_CURRENT_ERROR) &&
+ (error_code == SSD_CURRENT_ERROR ||
+ error_code == SSD_DESC_CURRENT_ERROR) &&
(sense_key == SSD_KEY_ILLEGAL_REQUEST))))
{
softc->flags &= ~DA_FLAG_CAN_RC16;
free(rdcap, M_SCSIDA);
@@ -4485,7 +4486,8 @@ dadone(struct cam_periph *periph, union ccb *done_ccb)
* unit not supported" (0x25) error.
*/
if ((have_sense) && (asc != 0x25)
- && (error_code == SSD_CURRENT_ERROR)) {
+ && (error_code == SSD_CURRENT_ERROR
+ || error_code == SSD_DESC_CURRENT_ERROR)) {
const char *sense_key_desc;
const char *asc_desc;
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
