diff options
| author | NeilBrown <neilb@suse.de> | 2010-04-14 17:02:09 +1000 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2010-05-18 15:27:49 +1000 |
| commit | 233fca36bb439eadcad28500b5139fed7c64a0ae (patch) | |
| tree | dfaec050a24564da4d05ec0e21cd814375eae1e8 | |
| parent | b71031076e1169e89bdac1b245ad1488587e4730 (diff) | |
| download | kernel_samsung_smdk4412-233fca36bb439eadcad28500b5139fed7c64a0ae.zip kernel_samsung_smdk4412-233fca36bb439eadcad28500b5139fed7c64a0ae.tar.gz kernel_samsung_smdk4412-233fca36bb439eadcad28500b5139fed7c64a0ae.tar.bz2 | |
md: Relax checks on ->max_disks when external metadata handling is used.
When metadata is being managed by user-space, md doesn't know
what the maximum number of devices allowed in an array is
so ->max_disks is 0. In this case we should allow any (+ve)
number of disks.
Signed-off-by: NeilBrown <neilb@suse.de>
| -rw-r--r-- | drivers/md/md.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/drivers/md/md.c b/drivers/md/md.c index 766be87..46bdf4b 100644 --- a/drivers/md/md.c +++ b/drivers/md/md.c @@ -2801,8 +2801,9 @@ static void analyze_sbs(mddev_t * mddev) i = 0; rdev_for_each(rdev, tmp, mddev) { - if (rdev->desc_nr >= mddev->max_disks || - i > mddev->max_disks) { + if (mddev->max_disks && + (rdev->desc_nr >= mddev->max_disks || + i > mddev->max_disks)) { printk(KERN_WARNING "md: %s: %s: only %d devices permitted\n", mdname(mddev), bdevname(rdev->bdev, b), @@ -5406,7 +5407,7 @@ static int update_raid_disks(mddev_t *mddev, int raid_disks) if (mddev->pers->check_reshape == NULL) return -EINVAL; if (raid_disks <= 0 || - raid_disks >= mddev->max_disks) + (mddev->max_disks && raid_disks >= mddev->max_disks)) return -EINVAL; if (mddev->sync_thread || mddev->reshape_position != MaxSector) return -EBUSY; |