diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:16:20 -0500 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-11-11 03:16:20 -0500 |
| commit | 45b86a96f17cb2900f291129b0e67287400e45b2 (patch) | |
| tree | f7968bf36e3947ee42251f7eebc6ea5f24aca202 /drivers/md/raid10.c | |
| parent | 072ba49838b42c873c496d72c91bb237914cf3b6 (diff) | |
| parent | 4143c5cb36331155a1823af8b3a8c761a59fed71 (diff) | |
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-2.6-trace into tracing/urgent
Diffstat (limited to 'drivers/md/raid10.c')
| -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 da5129a24b18..970a96ef9b18 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) | |||
| 1137 | if (!enough(conf)) | 1137 | if (!enough(conf)) |
| 1138 | return -EINVAL; | 1138 | return -EINVAL; |
| 1139 | 1139 | ||
| 1140 | if (rdev->raid_disk) | 1140 | if (rdev->raid_disk >= 0) |
| 1141 | first = last = rdev->raid_disk; | 1141 | first = last = rdev->raid_disk; |
| 1142 | 1142 | ||
| 1143 | if (rdev->saved_raid_disk >= 0 && | 1143 | if (rdev->saved_raid_disk >= 0 && |