diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-10 09:49:46 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2008-07-10 09:49:46 -0700 |
| commit | 2283af5b0b99565f516eacd756df2b1ddf9f4f85 (patch) | |
| tree | 4930014b56cb1773e175cbeb8e7833584e3074bb /drivers | |
| parent | 6329d3021bcfa9038621e6e917d98929421d8ec8 (diff) | |
| parent | 7a1fc53c5adb910751a9b212af90302eb4ffb527 (diff) | |
| download | linux-2283af5b0b99565f516eacd756df2b1ddf9f4f85.tar.gz linux-2283af5b0b99565f516eacd756df2b1ddf9f4f85.tar.bz2 linux-2283af5b0b99565f516eacd756df2b1ddf9f4f85.zip | |
Merge branch 'for-2.6.26' of git://neil.brown.name/md
* 'for-2.6.26' of git://neil.brown.name/md:
md: ensure all blocks are uptodate or locked when syncing
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 54c8ee28fcc4..3b27df52456b 100644 --- a/drivers/md/raid5.c +++ b/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)) |