aboutsummaryrefslogtreecommitdiff
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/cam/ctl/ctl.c4
-rw-r--r--sys/cam/ctl/ctl_backend_block.c23
-rw-r--r--sys/cam/ctl/ctl_error.c4
-rw-r--r--sys/cam/ctl/ctl_error.h2
4 files changed, 18 insertions, 15 deletions
diff --git a/sys/cam/ctl/ctl.c b/sys/cam/ctl/ctl.c
index 20877065ccc0..4e6fcb7ef778 100644
--- a/sys/cam/ctl/ctl.c
+++ b/sys/cam/ctl/ctl.c
@@ -12046,7 +12046,9 @@ ctl_inject_error(struct ctl_lun *lun, union ctl_io *io)
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
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c
index 975de2c9b5ae..9fe376e460e3 100644
--- a/sys/cam/ctl/ctl_backend_block.c
+++ b/sys/cam/ctl/ctl_backend_block.c
@@ -542,8 +542,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;
}
@@ -758,17 +760,14 @@ ctl_be_block_dispatch_file(struct ctl_be_block_lun *be_lun,
* 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;
}
@@ -934,8 +933,10 @@ ctl_be_block_dispatch_zvol(struct ctl_be_block_lun *be_lun,
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;
}
diff --git a/sys/cam/ctl/ctl_error.c b/sys/cam/ctl/ctl_error.c
index 4eec276496d4..8e6fcdf194ba 100644
--- a/sys/cam/ctl/ctl_error.c
+++ b/sys/cam/ctl/ctl_error.c
@@ -686,9 +686,9 @@ ctl_set_internal_failure(struct ctl_scsiio *ctsio, int sks_valid,
}
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,
diff --git a/sys/cam/ctl/ctl_error.h b/sys/cam/ctl/ctl_error.h
index 942def163acb..064f621b1b8e 100644
--- a/sys/cam/ctl/ctl_error.h
+++ b/sys/cam/ctl/ctl_error.h
@@ -73,7 +73,7 @@ void ctl_set_lun_standby(struct ctl_scsiio *ctsio);
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);