Commit 7747ae24 authored May 08, 2015 by NeilBrown Committed by Sasha Levin Jun 10, 2015

md/raid5: don't record new size if resize_stripes fails.



[ Upstream commit 6e9eac2dcee5e19f125967dd2be3e36558c42fff ]

If any memory allocation in resize_stripes fails we will return
-ENOMEM, but in some cases we update conf->pool_size anyway.

This means that if we try again, the allocations will be assumed
to be larger than they are, and badness results.

So only update pool_size if there is no error.

This bug was introduced in 2.6.17 and the patch is suitable for
-stable.

Fixes: ad01c9e3 ("[PATCH] md: Allow stripes to be expanded in preparation for expanding an array")
Cc: stable@vger.kernel.org (v2.6.17+)
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>

parent 954e5220

drivers/md/raid5.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -1936,6 +1936,7 @@ static int resize_stripes(struct r5conf *conf, int newsize)

		conf->slab_cache = sc;
		conf->active_name = 1-conf->active_name;
		if (!err)
		conf->pool_size = newsize;
		return err;
		}