From c640df3f07243bf03d039644a43a0d29d880e6d5 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Sun, 10 Dec 2006 02:20:51 -0800 Subject: [PATCH] --- yaml --- r: 44003 b: refs/heads/master c: c2b00852fbae4f8c45c2651530ded3bd01bde814 h: refs/heads/master i: 44001: 400f0db1f07780d756a3cf7aaa25a64eef2cf28b 43999: 53cb41b36d160d625a44914e537f7da6e537482b v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 16 ++++++++++++---- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 1183d81f6eb9..78e93353336f 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b8c6b645563d641df91fdcfd84a9c73c91d75b61 +refs/heads/master: c2b00852fbae4f8c45c2651530ded3bd01bde814 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 347caab99ca0..377f8bc9b78b 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -1818,7 +1818,9 @@ static void handle_stripe5(struct stripe_head *sh) return_bi = bi->bi_next; bi->bi_next = NULL; bi->bi_size = 0; - bi->bi_end_io(bi, bytes, 0); + bi->bi_end_io(bi, bytes, + test_bit(BIO_UPTODATE, &bi->bi_flags) + ? 0 : -EIO); } for (i=disks; i-- ;) { int rw; @@ -2359,7 +2361,9 @@ static void handle_stripe6(struct stripe_head *sh, struct page *tmp_page) return_bi = bi->bi_next; bi->bi_next = NULL; bi->bi_size = 0; - bi->bi_end_io(bi, bytes, 0); + bi->bi_end_io(bi, bytes, + test_bit(BIO_UPTODATE, &bi->bi_flags) + ? 0 : -EIO); } for (i=disks; i-- ;) { int rw; @@ -2859,7 +2863,9 @@ static int make_request(request_queue_t *q, struct bio * bi) if ( rw == WRITE ) md_write_end(mddev); bi->bi_size = 0; - bi->bi_end_io(bi, bytes, 0); + bi->bi_end_io(bi, bytes, + test_bit(BIO_UPTODATE, &bi->bi_flags) + ? 0 : -EIO); } return 0; } @@ -3127,7 +3133,9 @@ static int retry_aligned_read(raid5_conf_t *conf, struct bio *raid_bio) int bytes = raid_bio->bi_size; raid_bio->bi_size = 0; - raid_bio->bi_end_io(raid_bio, bytes, 0); + raid_bio->bi_end_io(raid_bio, bytes, + test_bit(BIO_UPTODATE, &raid_bio->bi_flags) + ? 0 : -EIO); } if (atomic_dec_and_test(&conf->active_aligned_reads)) wake_up(&conf->wait_for_stripe);