diff options
| author | Alexander Motin <mav@FreeBSD.org> | 2015-09-17 12:52:18 +0000 |
|---|---|---|
| committer | Alexander Motin <mav@FreeBSD.org> | 2015-09-17 12:52:18 +0000 |
| commit | 7f7bb97a0f9b8d1726f2fb7db3895068f2e128ea (patch) | |
| tree | fbc22d0a3a17dcfbcab46cbe367a3da6895e855f /sys/cam/ctl/ctl_backend_block.c | |
| parent | 5f3a15445d02d97e7ca0aa8101e9fa615ef93014 (diff) | |
| download | src-7f7bb97a0f9b8d1726f2fb7db3895068f2e128ea.tar.gz src-7f7bb97a0f9b8d1726f2fb7db3895068f2e128ea.zip | |
Report proper medium error code for VERIFY commands.
Notes
Notes:
svn path=/head/; revision=287912
Diffstat (limited to 'sys/cam/ctl/ctl_backend_block.c')
| -rw-r--r-- | sys/cam/ctl/ctl_backend_block.c | 23 |
1 files changed, 12 insertions, 11 deletions
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; } |