diff options
| author | NeilBrown <neilb@suse.de> | 2015-05-08 18:19:34 +1000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2015-08-07 00:32:10 +0100 |
| commit | c20694a054e903745591f4f85b39ecbce4e58349 (patch) | |
| tree | f43ebaf6d5cd7af32449745e6fed18fe91a31b58 | |
| parent | d370a4107e9b9fcbf76e23119e6fb447c42c3f91 (diff) | |
| download | kernel_samsung_smdk4412-c20694a054e903745591f4f85b39ecbce4e58349.zip kernel_samsung_smdk4412-c20694a054e903745591f4f85b39ecbce4e58349.tar.gz kernel_samsung_smdk4412-c20694a054e903745591f4f85b39ecbce4e58349.tar.bz2 | |
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: Ben Hutchings <ben@decadent.org.uk>
| -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 c293d9c..6056ee7 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1554,7 +1554,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; } |