summaryrefslogtreecommitdiffstats
path: root/drivers/md
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2011-10-31 15:21:29 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2011-10-31 15:21:29 -0700
commit571109f5369efbd3f7d09b4e331c1aa4de3e411a (patch)
tree747abcc3cae63c3e8fa279bf9b2e4b1929342769 /drivers/md
parent839d8810747bbf39e0a5a7f223b67bffa7945f8d (diff)
parent7fcc7c8acf0fba44d19a713207af7e58267c1179 (diff)
downloadlinux-571109f5369efbd3f7d09b4e331c1aa4de3e411a.tar.bz2
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.c2
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)
struct mirror_info *p = &conf->mirrors[mirror];
if (p->recovery_disabled == mddev->recovery_disabled)
continue;
- if (!p->rdev)
+ if (p->rdev)
continue;
disk_stack_limits(mddev->gendisk, rdev->bdev,