---

yaml --- r: 334259 b: refs/heads/master c: e56108d h: refs/heads/master i: 334257: 70f87e8 334255: fc4cb0a v: v3
git-mirror · Oct 11, 2012 · c714768 · c714768
1 parent 86f97c9
commit c714768
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git 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
@@ -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)