mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-06 02:24:14 +08:00
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: ad01c9e375
("[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>
This commit is contained in:
parent
10d82c5f0d
commit
6e9eac2dce
@ -2216,7 +2216,8 @@ static int resize_stripes(struct r5conf *conf, int newsize)
|
|||||||
|
|
||||||
conf->slab_cache = sc;
|
conf->slab_cache = sc;
|
||||||
conf->active_name = 1-conf->active_name;
|
conf->active_name = 1-conf->active_name;
|
||||||
conf->pool_size = newsize;
|
if (!err)
|
||||||
|
conf->pool_size = newsize;
|
||||||
return err;
|
return err;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user