Author: mav
Date: Mon Oct 5 09:26:52 2015
New Revision: 288765
URL: https://svnweb.freebsd.org/changeset/base/288765
Log:
MFC r287912: Report proper medium error code for VERIFY commands.
Modified:
stable/10/sys/cam/ctl/ctl.c
stable/10/sys/cam/ctl/ctl_backend_block.c
stable/10/sys/cam/ctl/ctl_error.c
stable/10/sys/cam/ctl/ctl_error.h
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/sys/cam/ctl/ctl.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl.c Mon Oct 5 09:26:00 2015 (r288764)
+++ stable/10/sys/cam/ctl/ctl.c Mon Oct 5 09:26:52 2015 (r288765)
@@ -12048,7 +12048,9 @@ ctl_inject_error(struct ctl_lun *lun, un
ctl_set_aborted(&io->scsiio);
break;
case CTL_LUN_INJ_MEDIUM_ERR:
- ctl_set_medium_error(&io->scsiio);
+ ctl_set_medium_error(&io->scsiio,
+ (io->io_hdr.flags & CTL_FLAG_DATA_MASK) !=
+ CTL_FLAG_DATA_OUT);
break;
case CTL_LUN_INJ_UA:
/* 29h/00h POWER ON, RESET, OR BUS DEVICE RESET
Modified: stable/10/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_backend_block.c Mon Oct 5 09:26:00 2015
(r288764)
+++ stable/10/sys/cam/ctl/ctl_backend_block.c Mon Oct 5 09:26:52 2015
(r288765)
@@ -545,8 +545,10 @@ ctl_be_block_biodone(struct bio *bio)
ctl_set_internal_failure(&io->scsiio,
/*sks_valid*/ 1,
/*retry_count*/ 0xbad2);
- } else
- ctl_set_medium_error(&io->scsiio);
+ } else {
+ ctl_set_medium_error(&io->scsiio,
+ beio->bio_cmd == BIO_READ);
+ }
ctl_complete_beio(beio);
return;
}
@@ -761,17 +763,14 @@ ctl_be_block_dispatch_file(struct ctl_be
* return the I/O to the user.
*/
if (error != 0) {
- char path_str[32];
-
- ctl_scsi_path_string(io, path_str, sizeof(path_str));
- printf("%s%s command returned errno %d\n", path_str,
- (beio->bio_cmd == BIO_READ) ? "READ" : "WRITE", error);
if (error == ENOSPC || error == EDQUOT) {
ctl_set_space_alloc_fail(&io->scsiio);
} else if (error == EROFS || error == EACCES) {
ctl_set_hw_write_protected(&io->scsiio);
- } else
- ctl_set_medium_error(&io->scsiio);
+ } else {
+ ctl_set_medium_error(&io->scsiio,
+ beio->bio_cmd == BIO_READ);
+ }
ctl_complete_beio(beio);
return;
}
@@ -937,8 +936,10 @@ ctl_be_block_dispatch_zvol(struct ctl_be
ctl_set_space_alloc_fail(&io->scsiio);
} else if (error == EROFS || error == EACCES) {
ctl_set_hw_write_protected(&io->scsiio);
- } else
- ctl_set_medium_error(&io->scsiio);
+ } else {
+ ctl_set_medium_error(&io->scsiio,
+ beio->bio_cmd == BIO_READ);
+ }
ctl_complete_beio(beio);
return;
}
Modified: stable/10/sys/cam/ctl/ctl_error.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_error.c Mon Oct 5 09:26:00 2015
(r288764)
+++ stable/10/sys/cam/ctl/ctl_error.c Mon Oct 5 09:26:52 2015
(r288765)
@@ -686,9 +686,9 @@ ctl_set_internal_failure(struct ctl_scsi
}
void
-ctl_set_medium_error(struct ctl_scsiio *ctsio)
+ctl_set_medium_error(struct ctl_scsiio *ctsio, int read)
{
- if ((ctsio->io_hdr.flags & CTL_FLAG_DATA_MASK) == CTL_FLAG_DATA_IN) {
+ if (read) {
/* "Unrecovered read error" */
ctl_set_sense(ctsio,
/*current_error*/ 1,
Modified: stable/10/sys/cam/ctl/ctl_error.h
==============================================================================
--- stable/10/sys/cam/ctl/ctl_error.h Mon Oct 5 09:26:00 2015
(r288764)
+++ stable/10/sys/cam/ctl/ctl_error.h Mon Oct 5 09:26:52 2015
(r288765)
@@ -73,7 +73,7 @@ void ctl_set_lun_standby(struct ctl_scsi
void ctl_set_lun_unavail(struct ctl_scsiio *ctsio);
void ctl_set_internal_failure(struct ctl_scsiio *ctsio, int sks_valid,
uint16_t retry_count);
-void ctl_set_medium_error(struct ctl_scsiio *ctsio);
+void ctl_set_medium_error(struct ctl_scsiio *ctsio, int read);
void ctl_set_aborted(struct ctl_scsiio *ctsio);
void ctl_set_lba_out_of_range(struct ctl_scsiio *ctsio);
void ctl_set_lun_stopped(struct ctl_scsiio *ctsio);
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
