diff options
| author | NeilBrown <neilb@suse.de> | 2015-05-08 11:19:34 +0300 |
|---|---|---|
| committer | Zefan Li <lizefan@huawei.com> | 2015-09-18 04:20:38 +0300 |
| commit | ece8cda08af85d72b151b2071df2d92a16b291b1 (patch) | |
| tree | 2bb2ddc13823d2abce3ee65e74c107a76917ba0b /drivers | |
| parent | 80fc8f6abe0a8fd267d7bd8d1eb873d4ce889293 (diff) | |
| download | linux-ece8cda08af85d72b151b2071df2d92a16b291b1.tar.xz | |
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: Zefan Li <lizefan@huawei.com>
Diffstat (limited to 'drivers')
| -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 c276ad09ace9..7a218e81eb39 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -1622,7 +1622,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; } |