From 8c8327a581d98d840f0605b74d52f75d62ea0dc6 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Thu, 10 Jul 2008 10:10:02 -0700 Subject: [PATCH] --- yaml --- r: 98802 b: refs/heads/master c: 08405b8bd1795145e0f9cb8cb13949281efe9ec2 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 7 +------ 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/[refs] b/[refs] index 9f501cac5dc9..ed5290812c2b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 872ac8743cb400192a9fce4ba2d3ffd7bb309685 +refs/heads/master: 08405b8bd1795145e0f9cb8cb13949281efe9ec2 diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 54c8ee28fcc4..3b27df52456b 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -2017,12 +2017,7 @@ static int __handle_issuing_new_read_requests5(struct stripe_head *sh, */ s->uptodate++; return 0; /* uptodate + compute == disks */ - } else if ((s->uptodate < disks - 1) && - test_bit(R5_Insync, &dev->flags)) { - /* Note: we hold off compute operations while checks are - * in flight, but we still prefer 'compute' over 'read' - * hence we only read if (uptodate < * disks-1) - */ + } else if (test_bit(R5_Insync, &dev->flags)) { set_bit(R5_LOCKED, &dev->flags); set_bit(R5_Wantread, &dev->flags); if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending))