aboutsummaryrefslogtreecommitdiff
path: root/drivers/md/raid10.c
diff options
context:
space:
mode:
authorBen Dooks <ben-linux@fluff.org>2008-11-10 10:16:17 +0000
committerBen Dooks <ben-linux@fluff.org>2008-11-10 10:16:17 +0000
commitd79aab2852cd89ed8b792d633c9bebc0c6af74ac (patch)
tree029dec967090ff96578df1fcf70d358a34c2dc3e /drivers/md/raid10.c
parent039d35267d79b9feae3a850f54b2677dea019f0a (diff)
parentf7160c7573615ec82c691e294cf80d920b5d588d (diff)
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6 into rmk-next
Diffstat (limited to 'drivers/md/raid10.c')
-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 da5129a24b1..970a96ef9b1 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -1137,7 +1137,7 @@ static int raid10_add_disk(mddev_t *mddev, mdk_rdev_t *rdev)
if (!enough(conf))
return -EINVAL;
- if (rdev->raid_disk)
+ if (rdev->raid_disk >= 0)
first = last = rdev->raid_disk;
if (rdev->saved_raid_disk >= 0 &&