diff options
author | Olof Johansson <olof@lixom.net> | 2012-09-13 09:34:11 +0400 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2012-09-13 09:34:11 +0400 |
commit | 025c95a6826ad8acfe871f33c2fa9208beeb38df (patch) | |
tree | 220fe156ff60db13bd3a1319f5e20d6b723de5f4 /fs/bio.c | |
parent | 0558d7a8ed44e6e53aadb04d2e23145efb2aa8a4 (diff) | |
parent | 7f744b17140af1a9c8804a1c81c9dae6bb52a7fb (diff) | |
download | linux-025c95a6826ad8acfe871f33c2fa9208beeb38df.tar.xz |
Merge branch 'clk' of git://github.com/hzhuang1/linux into next/cleanup
* 'clk' of git://github.com/hzhuang1/linux:
ARM: mmp: remove unused definition in APBC and APMU
ARM: mmp: move mmp2 clock definition to separated file
arm: mmp: move pxa910 clock definition to separated file
arm: mmp: move pxa168 clock definition to separated file
arm: mmp: make private clock definition exclude from common clock
+ Linux 3.6-rc4
Diffstat (limited to 'fs/bio.c')
-rw-r--r-- | fs/bio.c | 11 |
1 files changed, 6 insertions, 5 deletions
@@ -73,7 +73,7 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size) { unsigned int sz = sizeof(struct bio) + extra_size; struct kmem_cache *slab = NULL; - struct bio_slab *bslab; + struct bio_slab *bslab, *new_bio_slabs; unsigned int i, entry = -1; mutex_lock(&bio_slab_lock); @@ -97,11 +97,12 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size) if (bio_slab_nr == bio_slab_max && entry == -1) { bio_slab_max <<= 1; - bio_slabs = krealloc(bio_slabs, - bio_slab_max * sizeof(struct bio_slab), - GFP_KERNEL); - if (!bio_slabs) + new_bio_slabs = krealloc(bio_slabs, + bio_slab_max * sizeof(struct bio_slab), + GFP_KERNEL); + if (!new_bio_slabs) goto out_unlock; + bio_slabs = new_bio_slabs; } if (entry == -1) entry = bio_slab_nr++; |