diff options
| author | NeilBrown <neilb@suse.de> | 2015-05-08 18:19:34 +1000 |
|---|---|---|
| committer | Willy Tarreau <w@1wt.eu> | 2015-09-18 13:52:00 +0200 |
| commit | 26a42fd3d6d5723b970cd8251abb87984d440bb4 (patch) | |
| tree | 3aee2963969ea8f5e6db3abe029009c48e852a71 | |
| parent | 7b5f777748799261710c6153e4e42354cc849047 (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: Ben Hutchings <ben@decadent.org.uk>
(cherry picked from commit c20694a054e903745591f4f85b39ecbce4e58349)
Signed-off-by: Willy Tarreau <w@1wt.eu>
| -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 4d70eef22354..7eb8b467b9f2 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1452,7 +1452,8 @@ static int resize_stripes(raid5_conf_t *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; } |