diff options
| author | NeilBrown <neilb@suse.de> | 2015-05-08 18:19:34 +1000 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2015-06-03 11:33:13 +0200 |
| commit | 9ad2da11417ffe92aa2daba75c5d13b2481aa6c8 (patch) | |
| tree | 386294ed8b213aac35098754570039efb6eeec16 /drivers/md | |
| parent | bca746037a308e2fbe742248d34635f07be2bfd9 (diff) | |
md/raid5: don't record new size if resize_stripes fails.
commit 6e9eac2dcee5e19f125967dd2be3e36558c42fff 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: ad01c9e3752f ("[PATCH] md: Allow stripes to be expanded in preparation for expanding an array")
Signed-off-by: NeilBrown <neilb@suse.de>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 09c18062bbc2..4881851c4b42 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1812,7 +1812,8 @@ static int resize_stripes(struct r5conf *conf, int newsize) conf->slab_cache = sc; conf->active_name = 1-conf->active_name; - conf->pool_size = newsize; + if (!err) + conf->pool_size = newsize; return err; } |