From: NeilBrown <neilb@suse.de>
Date: Sat, 23 Aug 2014 10:19:26 +0000 (+1000)
Subject: md/raid10: another memory leak due to reshape.
X-Git-Tag: firefly_0821_release~176^2~3017^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=c4796e215f487de9bc93731a81e885ac866ef7dc;p=firefly-linux-kernel-4.4.55.git

md/raid10: another memory leak due to reshape.

Signed-off-by: NeilBrown <neilb@suse.de>
---

diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c
index a2788bcf75b2..8fa37eceaef3 100644
--- a/drivers/md/raid10.c
+++ b/drivers/md/raid10.c
@@ -3834,6 +3834,8 @@ static int stop(struct mddev *mddev)
 		mempool_destroy(conf->r10bio_pool);
 	safe_put_page(conf->tmppage);
 	kfree(conf->mirrors);
+	kfree(conf->mirrors_old);
+	kfree(conf->mirrors_new);
 	kfree(conf);
 	mddev->private = NULL;
 	return 0;
@@ -4121,7 +4123,7 @@ static int raid10_start_reshape(struct mddev *mddev)
 		memcpy(conf->mirrors_new, conf->mirrors,
 		       sizeof(struct raid10_info)*conf->prev.raid_disks);
 		smp_mb();
-		kfree(conf->mirrors_old); /* FIXME and elsewhere */
+		kfree(conf->mirrors_old);
 		conf->mirrors_old = conf->mirrors;
 		conf->mirrors = conf->mirrors_new;
 		conf->mirrors_new = NULL;