diff options
Diffstat (limited to 'fs/bio.c')
| -rw-r--r-- | fs/bio.c | 13 | 
1 files changed, 7 insertions, 6 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++; @@ -1312,7 +1313,7 @@ EXPORT_SYMBOL(bio_copy_kern);   * Note that this code is very hard to test under normal circumstances because   * direct-io pins the pages with get_user_pages().  This makes   * is_page_cache_freeable return false, and the VM will not clean the pages. - * But other code (eg, pdflush) could clean the pages if they are mapped + * But other code (eg, flusher threads) could clean the pages if they are mapped   * pagecache.   *   * Simply disabling the call to bio_set_pages_dirty() is a good way to test the  |