diff --git a/[refs] b/[refs] index 4b5294d260c6..35a735a4cbdb 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: d11c171e636cfd2df818cf3411d88222c2f4fcef +refs/heads/master: 220946c9018de74b952446e3a4dff1bfd4cbf310 diff --git a/trunk/drivers/md/raid1.c b/trunk/drivers/md/raid1.c index 7fbb60883280..6c10f28bc25e 100644 --- a/trunk/drivers/md/raid1.c +++ b/trunk/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 {