|
@@ -2017,12 +2017,7 @@ static int __handle_issuing_new_read_requests5(struct stripe_head *sh,
|
|
*/
|
|
*/
|
|
s->uptodate++;
|
|
s->uptodate++;
|
|
return 0; /* uptodate + compute == disks */
|
|
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_LOCKED, &dev->flags);
|
|
set_bit(R5_Wantread, &dev->flags);
|
|
set_bit(R5_Wantread, &dev->flags);
|
|
if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending))
|
|
if (!test_and_set_bit(STRIPE_OP_IO, &sh->ops.pending))
|