diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 09:36:17 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-06 09:36:17 +0100 |
| commit | 0e44e059588e1d91f3a1974d2ce3348864d1d799 (patch) | |
| tree | 1161c2508bd9eeab010ebc40ef87860fd85a35fd /drivers/md/raid1.c | |
| parent | 96886c4361f1ae3f6c775d7c9295e2d557101d0f (diff) | |
| parent | e8a7e48bb248a1196484d3f8afa53bded2b24e71 (diff) | |
| download | talos-op-linux-0e44e059588e1d91f3a1974d2ce3348864d1d799.tar.gz talos-op-linux-0e44e059588e1d91f3a1974d2ce3348864d1d799.zip | |
Merge commit 'v2.6.37-rc4' into imx-for-2.6.38
Done to resolve merge conflict:
Conflicts:
arch/arm/mach-mx25/devices-imx25.h
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
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) * is not possible. */ if (!test_bit(Faulty, &rdev->flags) && + !mddev->recovery_disabled && mddev->degraded < conf->raid_disks) { err = -EBUSY; goto abort; |
