aboutsummaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2006-01-06 00:20:27 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-06 08:34:04 -0800
commit220946c9018de74b952446e3a4dff1bfd4cbf310 (patch)
tree8a6a85f23ff3e12ed9c770eb9f2b835125ad5378 /drivers
parentd11c171e636cfd2df818cf3411d88222c2f4fcef (diff)
[PATCH] md: make sure read error on last working drive of raid1 actually returns failure
We are inadvertently setting the R1BIO_Uptodate bit on read errors when we decide not to try correcting (because there are no other working devices). This means that the read error is reported to the client as success. Signed-off-by: Neil Brown <neilb@suse.de> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/raid1.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c
index 7fbb6088328..6c10f28bc25 100644
--- a/drivers/md/raid1.c
+++ b/drivers/md/raid1.c
@@ -284,7 +284,8 @@ static int raid1_end_read_request(struct bio *bio, unsigned int bytes_done, int
* user-side. So if something waits for IO, then it will
* wait for the 'master' bio.
*/
- set_bit(R1BIO_Uptodate, &r1_bio->state);
+ if (uptodate)
+ set_bit(R1BIO_Uptodate, &r1_bio->state);
raid_end_bio_io(r1_bio);
} else {