In a few places in the code, we don't know if a bio has failed or completed successfully, so use bio_set_status() instead of setting bi_status directly. That way, bi_status will never be set to BI_STS_OK (0) during completion.
Signed-off-by: Andreas Gruenbacher <[email protected]> --- block/blk-crypto-fallback.c | 2 +- drivers/block/ps3vram.c | 2 +- drivers/md/dm-flakey.c | 2 +- drivers/md/dm-verity-target.c | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/block/blk-crypto-fallback.c b/block/blk-crypto-fallback.c index 8a2631b1e7e1..7014f646e236 100644 --- a/block/blk-crypto-fallback.c +++ b/block/blk-crypto-fallback.c @@ -150,7 +150,7 @@ static void blk_crypto_fallback_encrypt_endio(struct bio *enc_bio) mempool_free(enc_bio->bi_io_vec[i].bv_page, blk_crypto_bounce_page_pool); - src_bio->bi_status = enc_bio->bi_status; + bio_set_status(src_bio, enc_bio->bi_status); bio_uninit(enc_bio); kfree(enc_bio); diff --git a/drivers/block/ps3vram.c b/drivers/block/ps3vram.c index bdcf083b45e2..06844674c998 100644 --- a/drivers/block/ps3vram.c +++ b/drivers/block/ps3vram.c @@ -573,7 +573,7 @@ static struct bio *ps3vram_do_bio(struct ps3_system_bus_device *dev, next = bio_list_peek(&priv->list); spin_unlock_irq(&priv->lock); - bio->bi_status = error; + bio_set_status(bio, error); bio_endio(bio); return next; } diff --git a/drivers/md/dm-flakey.c b/drivers/md/dm-flakey.c index 08925aca838c..8dde47beb387 100644 --- a/drivers/md/dm-flakey.c +++ b/drivers/md/dm-flakey.c @@ -420,7 +420,7 @@ static void clone_free(struct bio *clone) static void clone_endio(struct bio *clone) { struct bio *bio = clone->bi_private; - bio->bi_status = clone->bi_status; + bio_set_status(bio, clone->bi_status); clone_free(clone); bio_endio(bio); } diff --git a/drivers/md/dm-verity-target.c b/drivers/md/dm-verity-target.c index 66a00a8ccb39..4793bcf546ad 100644 --- a/drivers/md/dm-verity-target.c +++ b/drivers/md/dm-verity-target.c @@ -544,7 +544,7 @@ static void verity_finish_io(struct dm_verity_io *io, blk_status_t status) struct bio *bio = dm_bio_from_per_bio_data(io, v->ti->per_io_data_size); bio->bi_end_io = io->orig_bi_end_io; - bio->bi_status = status; + bio_set_status(bio, status); if (!static_branch_unlikely(&use_bh_wq_enabled) || !io->in_bh) verity_fec_finish_io(io); -- 2.51.0
