diff options
author | NeilBrown <neilb@suse.de> | 2015-05-08 18:19:34 +1000 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2015-06-06 08:19:39 -0700 |
commit | 41801e3c8024d12cfeacc3be4c79d0dad9a74b46 (patch) | |
tree | 32acc29e59e28ed1edd05d708acbdd42a391d140 /drivers/md/raid5.c | |
parent | dfa0af4392f58436b16b66a7fd12ba7a4a462ab2 (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: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/md/raid5.c')
-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 3545fafe2027..b98c70e1f1a9 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1914,7 +1914,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; } |