Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 30378
b: refs/heads/master
c: 3285edf
h: refs/heads/master
v: v3
  • Loading branch information
NeilBrown authored and Linus Torvalds committed Jun 26, 2006
1 parent 24f1eed commit 3124f56
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: b3cc9ec76ba44d010f4c820c4608b91aaf28a0b9
refs/heads/master: 3285edf152cefff482f95ceb90b1bd46ac169df1
2 changes: 1 addition & 1 deletion trunk/drivers/md/raid5.c
Original file line number Diff line number Diff line change
Expand Up @@ -2858,7 +2858,7 @@ static inline sector_t sync_request(mddev_t *mddev, sector_t sector_nr, int *ski
* to resync, then assert that we are finished, because there is
* nothing we can do.
*/
if (mddev->degraded >= (data_disks - raid_disks) &&
if (mddev->degraded >= conf->max_degraded &&
test_bit(MD_RECOVERY_SYNC, &mddev->recovery)) {
sector_t rv = (mddev->size << 1) - sector_nr;
*skipped = 1;
Expand Down

0 comments on commit 3124f56

Please sign in to comment.