diff options
| author | Sumit Semwal <sumit.semwal@linaro.org> | 2017-06-06 15:51:41 +0530 |
|---|---|---|
| committer | Sumit Semwal <sumit.semwal@linaro.org> | 2017-06-06 15:51:41 +0530 |
| commit | 611a390fbe4eb5e1ec2a7d535343c676c79fe292 (patch) | |
| tree | e9214a9f94514ffef8b97b374424cdf1231aab63 /drivers/md/raid5.c | |
| parent | c590abd05542097f8d54654386098987197c18f8 (diff) | |
| parent | e6ef55e85b67503fbcf5aa25305ff95bdc947f5f (diff) | |
Merge remote-tracking branch 'stable-rc/linux-4.4.y' into 4.4.71-hikey201706024.4-71-rc-hikey-20170602
Diffstat (limited to 'drivers/md/raid5.c')
| -rw-r--r-- | drivers/md/raid5.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 7af976934441..4384b46cee1a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c @@ -2232,6 +2232,10 @@ static int resize_stripes(struct r5conf *conf, int newsize) err = -ENOMEM; mutex_unlock(&conf->cache_size_mutex); + + conf->slab_cache = sc; + conf->active_name = 1-conf->active_name; + /* Step 4, return new stripes to service */ while(!list_empty(&newstripes)) { nsh = list_entry(newstripes.next, struct stripe_head, lru); @@ -2249,8 +2253,6 @@ static int resize_stripes(struct r5conf *conf, int newsize) } /* critical section pass, GFP_NOIO no longer needed */ - conf->slab_cache = sc; - conf->active_name = 1-conf->active_name; if (!err) conf->pool_size = newsize; return err; |