diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2008-07-10 18:15:04 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2008-07-24 09:14:07 -0700 |
| commit | fc46a59f78a80dc3957a00badaca2737ddf7fbfd (patch) | |
| tree | 4582a36a1427e7b6e911239727332bae97339d4a /drivers | |
| parent | ba9ecf2c7d4c64b3118260f5a056337e41a2612c (diff) | |
md: ensure all blocks are uptodate or locked when syncing
commit 7a1fc53c5adb910751a9b212af90302eb4ffb527 upstream
Remove the dubious attempt to prefer 'compute' over 'read'. Not only is it
wrong given commit c337869d (md: do not compute parity unless it is on a failed
drive), but it can trigger a BUG_ON in handle_parity_checks5().
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: Neil Brown <neilb@suse.de>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Diffstat (limited to 'drivers')
| -rw-r--r-- | drivers/md/raid5.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 856de3b866fe..ffcaab64cde6 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1999,12 +1999,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)) |