diff options
| -rw-r--r-- | block/bio.c | 4 | ||||
| -rw-r--r-- | block/t10-pi.c | 2 | ||||
| -rw-r--r-- | drivers/block/swim3.c | 2 | ||||
| -rw-r--r-- | drivers/md/dm-mpath.c | 1 |
4 files changed, 5 insertions, 4 deletions
diff --git a/block/bio.c b/block/bio.c index 7a5c8ed27f42..0e36ca5407b5 100644 --- a/block/bio.c +++ b/block/bio.c @@ -1817,8 +1817,8 @@ again: } if (bio->bi_bdev && bio_flagged(bio, BIO_TRACE_COMPLETION)) { - trace_block_bio_complete(bdev_get_queue(bio->bi_bdev), - bio, bio->bi_status); + trace_block_bio_complete(bdev_get_queue(bio->bi_bdev), bio, + blk_status_to_errno(bio->bi_status)); bio_clear_flag(bio, BIO_TRACE_COMPLETION); } diff --git a/block/t10-pi.c b/block/t10-pi.c index 350b3cbcf9e5..3416dadf7b15 100644 --- a/block/t10-pi.c +++ b/block/t10-pi.c @@ -91,7 +91,7 @@ static blk_status_t t10_pi_verify(struct blk_integrity_iter *iter, "(rcvd %u)\n", iter->disk_name, (unsigned long long) iter->seed, be32_to_cpu(pi->ref_tag)); - return -EILSEQ; + return BLK_STS_PROTECTION; } break; case 3: diff --git a/drivers/block/swim3.c b/drivers/block/swim3.c index c7953860ce91..e3399a138335 100644 --- a/drivers/block/swim3.c +++ b/drivers/block/swim3.c @@ -1245,7 +1245,7 @@ static int swim3_attach(struct macio_dev *mdev, return 0; } -static struct of_device_id swim3_match[] = +static const struct of_device_id swim3_match[] = { { .name = "swim3", diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index a7d2e0840cc5..0e8ab5bb3575 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -625,6 +625,7 @@ static void process_queued_bios(struct work_struct *work) case DM_MAPIO_KILL: bio->bi_status = BLK_STS_IOERR; bio_endio(bio); + break; case DM_MAPIO_REQUEUE: bio->bi_status = BLK_STS_DM_REQUEUE; bio_endio(bio); |