From 6d9a7e166d713cef4e00453b233410a3dbf0f2fa Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Wed, 14 Apr 2010 17:02:09 +1000 Subject: [PATCH] --- yaml --- r: 197482 b: refs/heads/master c: 233fca36bb439eadcad28500b5139fed7c64a0ae h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index aec223980814..5a126a7c8725 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: b71031076e1169e89bdac1b245ad1488587e4730 +refs/heads/master: 233fca36bb439eadcad28500b5139fed7c64a0ae diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 766be8701281..46bdf4b38be8 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/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;