From c7147686069031b4e043b2a4dd188d8ee75550c7 Mon Sep 17 00:00:00 2001 From: NeilBrown Date: Thu, 11 Oct 2012 14:24:13 +1100 Subject: [PATCH] --- yaml --- r: 334259 b: refs/heads/master c: e56108d65f8705170d238858616728359542aebb h: refs/heads/master i: 334257: 70f87e86e86f34eb422d8b3c19bae865fd7d13c6 334255: fc4cb0a8dff99a9beb729166dd6e6e4ef29e2b81 v: v3 --- [refs] | 2 +- trunk/drivers/md/raid5.c | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 168398e08ea1..eaeedd9a510b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: db07d85ef6395d4768c6cdceeb2ea4878bd2a3f4 +refs/heads/master: e56108d65f8705170d238858616728359542aebb diff --git a/trunk/drivers/md/raid5.c b/trunk/drivers/md/raid5.c index 4cc6b0e398bc..2737247d2a02 100644 --- a/trunk/drivers/md/raid5.c +++ b/trunk/drivers/md/raid5.c @@ -5871,7 +5871,8 @@ static int check_reshape(struct mddev *mddev) if (!check_stripe_cache(mddev)) return -ENOSPC; - return resize_stripes(conf, conf->raid_disks + mddev->delta_disks); + return resize_stripes(conf, (conf->previous_raid_disks + + mddev->delta_disks)); } static int raid5_start_reshape(struct mddev *mddev)