From b8cd0e68fad2b03eefb4ab4c69ec1c5dd57a0a2a Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Fri, 14 Jan 2011 09:14:34 +1100 Subject: [PATCH] --- yaml --- r: 230657 b: refs/heads/master c: ba1b41b6b4e30cb66ae2775faadea05cae3ce61c h: refs/heads/master i: 230655: 09898ce4430afb202c9e3d93dd573857dcf83fdd v: v3 --- [refs] | 2 +- trunk/drivers/md/md.c | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index ba20f19d6ba3..ddd80cc96c3d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1a940fcee31ec6c18c2f24dbdad31d54e4c35048 +refs/heads/master: ba1b41b6b4e30cb66ae2775faadea05cae3ce61c diff --git a/trunk/drivers/md/md.c b/trunk/drivers/md/md.c index 5e3714fecee9..665851308818 100644 --- a/trunk/drivers/md/md.c +++ b/trunk/drivers/md/md.c @@ -2479,6 +2479,10 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len) if (rdev2->raid_disk == slot) return -EEXIST; + if (slot >= rdev->mddev->raid_disks && + slot >= rdev->mddev->raid_disks + rdev->mddev->delta_disks) + return -ENOSPC; + rdev->raid_disk = slot; if (test_bit(In_sync, &rdev->flags)) rdev->saved_raid_disk = slot; @@ -2496,7 +2500,8 @@ slot_store(mdk_rdev_t *rdev, const char *buf, size_t len) /* failure here is OK */; /* don't wakeup anyone, leave that to userspace. */ } else { - if (slot >= rdev->mddev->raid_disks) + if (slot >= rdev->mddev->raid_disks && + slot >= rdev->mddev->raid_disks + rdev->mddev->delta_disks) return -ENOSPC; rdev->raid_disk = slot; /* assume it is working */