Commit a369f12e authored by NeilBrown's avatar NeilBrown Committed by Luis Henriques

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

commit 6e9eac2d upstream.

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")
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 0dc093f1
...@@ -1941,7 +1941,8 @@ static int resize_stripes(struct r5conf *conf, int newsize) ...@@ -1941,7 +1941,8 @@ static int resize_stripes(struct r5conf *conf, int newsize)
conf->slab_cache = sc; conf->slab_cache = sc;
conf->active_name = 1-conf->active_name; conf->active_name = 1-conf->active_name;
conf->pool_size = newsize; if (!err)
conf->pool_size = newsize;
return err; return err;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment