diff options
| author | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
|---|---|---|
| committer | Paul Mundt <lethal@linux-sh.org> | 2010-11-25 02:45:43 -0500 |
| commit | 1ad2096c4eba144522d87541c4024b8c84e95051 (patch) | |
| tree | a149d469a4da72a7b6e6b777879b740046c4ebc9 /drivers/md/raid1.c | |
| parent | c4d73e7d75a54451d6e073c118ba2b8d87bd350d (diff) | |
| parent | df73af86b6e737f357aae85e0b5e621516117780 (diff) | |
Merge branch 'rmobile/mmcif' into rmobile-latest
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 45f8324196ec..845cf95b612c 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c | |||
| @@ -1161,6 +1161,7 @@ static int raid1_remove_disk(mddev_t *mddev, int number) | |||
| 1161 | * is not possible. | 1161 | * is not possible. |
| 1162 | */ | 1162 | */ |
| 1163 | if (!test_bit(Faulty, &rdev->flags) && | 1163 | if (!test_bit(Faulty, &rdev->flags) && |
| 1164 | !mddev->recovery_disabled && | ||
| 1164 | mddev->degraded < conf->raid_disks) { | 1165 | mddev->degraded < conf->raid_disks) { |
| 1165 | err = -EBUSY; | 1166 | err = -EBUSY; |
| 1166 | goto abort; | 1167 | goto abort; |