---

yaml --- r: 98802 b: refs/heads/master c: 08405b8 h: refs/heads/master v: v3
git-mirror · Jul 10, 2008 · 8c8327a · 8c8327a
1 parent 7f11882
commit 8c8327a
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 7 deletions.
diff --git 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
@@ -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))