diff options
| author | mav <mav@FreeBSD.org> | 2017-01-05 11:38:22 +0000 |
|---|---|---|
| committer | mav <mav@FreeBSD.org> | 2017-01-05 11:38:22 +0000 |
| commit | 6b7d6f3c539e7460fc7ecb268868c5cdf0bf5d7f (patch) | |
| tree | a0d9ef49e0a8785b50712b302a2ecdcf7cd022ef /sys | |
| parent | 9330f9ad4c02f8cb0c61193da976286b36b49ba4 (diff) | |
| download | FreeBSD-src-6b7d6f3c539e7460fc7ecb268868c5cdf0bf5d7f.zip FreeBSD-src-6b7d6f3c539e7460fc7ecb268868c5cdf0bf5d7f.tar.gz | |
MFC r310298: Improve error handling when I/O split between several BIOs.
If we get several error codes, handle one with lowest offset.
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/cam/ctl/ctl_backend_block.c | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/sys/cam/ctl/ctl_backend_block.c b/sys/cam/ctl/ctl_backend_block.c index 924455d..8fa93cf 100644 --- a/sys/cam/ctl/ctl_backend_block.c +++ b/sys/cam/ctl/ctl_backend_block.c @@ -203,7 +203,8 @@ struct ctl_be_block_io { int num_bios_sent; int num_bios_done; int send_complete; - int num_errors; + int first_error; + uint64_t first_error_offset; struct bintime ds_t0; devstat_tag_type ds_tag_type; devstat_trans_flags ds_trans_type; @@ -489,8 +490,12 @@ ctl_be_block_biodone(struct bio *bio) error = bio->bio_error; mtx_lock(&be_lun->io_lock); - if (error != 0) - beio->num_errors++; + if (error != 0 && + (beio->first_error == 0 || + bio->bio_offset < beio->first_error_offset)) { + beio->first_error = error; + beio->first_error_offset = bio->bio_offset; + } beio->num_bios_done++; @@ -523,7 +528,8 @@ ctl_be_block_biodone(struct bio *bio) * If there are any errors from the backing device, we fail the * entire I/O with a medium error. */ - if (beio->num_errors > 0) { + error = beio->first_error; + if (error != 0) { if (error == EOPNOTSUPP) { ctl_set_invalid_opcode(&io->scsiio); } else if (error == ENOSPC || error == EDQUOT) { |
