From af3e3a5259e35d7056fbe568a0ffcbd1420e1742 Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 11 Mar 2016 17:34:50 +0100 Subject: block: don't unecessarily clobber bi_error for chained bios Only overwrite the parents bi_error if it was zero. That way a successful bio completion doesn't reset the error pointer. Reported-by: Brian Foster Signed-off-by: Christoph Hellwig Signed-off-by: Jens Axboe --- block/bio.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'block') diff --git a/block/bio.c b/block/bio.c index dbabd48b1934..282ca2e5aaf2 100644 --- a/block/bio.c +++ b/block/bio.c @@ -300,7 +300,8 @@ static void bio_chain_endio(struct bio *bio) { struct bio *parent = bio->bi_private; - parent->bi_error = bio->bi_error; + if (!parent->bi_error) + parent->bi_error = bio->bi_error; bio_endio(parent); bio_put(bio); } @@ -1753,7 +1754,9 @@ void bio_endio(struct bio *bio) */ if (bio->bi_end_io == bio_chain_endio) { struct bio *parent = bio->bi_private; - parent->bi_error = bio->bi_error; + + if (!parent->bi_error) + parent->bi_error = bio->bi_error; bio_put(bio); bio = parent; } else { -- cgit v1.2.1