diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 18:21:29 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2011-10-31 18:21:29 -0400 |
| commit | 571109f5369efbd3f7d09b4e331c1aa4de3e411a (patch) | |
| tree | 747abcc3cae63c3e8fa279bf9b2e4b1929342769 /drivers/md | |
| parent | 839d8810747bbf39e0a5a7f223b67bffa7945f8d (diff) | |
| parent | 7fcc7c8acf0fba44d19a713207af7e58267c1179 (diff) | |
Merge branch 'for-linus' of git://neil.brown.name/md
* 'for-linus' of git://neil.brown.name/md:
md/raid10: Fix bug when activating a hot-spare.
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid10.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 132c18ef8665..c025a8276dc1 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -1355,7 +1355,7 @@ static int raid10_add_disk(struct mddev *mddev, struct md_rdev *rdev) | |||
| 1355 | struct mirror_info *p = &conf->mirrors[mirror]; | 1355 | struct mirror_info *p = &conf->mirrors[mirror]; |
| 1356 | if (p->recovery_disabled == mddev->recovery_disabled) | 1356 | if (p->recovery_disabled == mddev->recovery_disabled) |
| 1357 | continue; | 1357 | continue; |
| 1358 | if (!p->rdev) | 1358 | if (p->rdev) |
| 1359 | continue; | 1359 | continue; |
| 1360 | 1360 | ||
| 1361 | disk_stack_limits(mddev->gendisk, rdev->bdev, | 1361 | disk_stack_limits(mddev->gendisk, rdev->bdev, |