diff options
| author | NeilBrown <neilb@suse.de> | 2015-05-08 10:19:34 +0200 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-05-08 10:47:35 +0200 |
| commit | 6e9eac2dcee5e19f125967dd2be3e36558c42fff (patch) | |
| tree | d98944269434f5921d00815de13f693b9c4114a5 /drivers/md | |
| parent | md/raid5: avoid reading parity blocks for full-stripe write to degraded array (diff) | |
| download | linux-6e9eac2dcee5e19f125967dd2be3e36558c42fff.tar.xz linux-6e9eac2dcee5e19f125967dd2be3e36558c42fff.zip | |
md/raid5: don't record new size if resize_stripes fails.
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")
Cc: stable@vger.kernel.org (v2.6.17+)
Signed-off-by: NeilBrown <neilb@suse.de>
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 85dc0e67fb88..9748e525e4c0 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2216,7 +2216,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; } |