leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

vfs: fix: don't increase bio_slab_max if krealloc() fails

Browse Source 
Without the patch, bio_slab_max, representing bio_slabs capacity, is increased before krealloc() of bio_slabs. If krealloc() fails, bio_slab_max is too high. Fix that by only updating bio_slab_max if krealloc() is successful.

Signed-off-by: Anna Leuschner <anna.m.leuschner@gmail.com>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
This commit is contained in:
Anna Leuschner 2012-10-22 21:53:36 +02:00 committed by Jens Axboe
parent 65c77fd9e8
commit 386bc35a2d
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fs/bio.c
View File

@ -75,6 +75,7 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size)
unsigned int sz = sizeof(struct bio) + extra_size; unsigned int sz = sizeof(struct bio) + extra_size;
struct kmem_cache *slab = NULL; struct kmem_cache *slab = NULL;
struct bio_slab *bslab, *new_bio_slabs; struct bio_slab *bslab, *new_bio_slabs;
unsigned int new_bio_slab_max;
unsigned int i, entry = -1; unsigned int i, entry = -1;
mutex_lock(&bio_slab_lock); mutex_lock(&bio_slab_lock);
@ -97,12 +98,13 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size)
goto out_unlock; goto out_unlock;
if (bio_slab_nr == bio_slab_max && entry == -1) { if (bio_slab_nr == bio_slab_max && entry == -1) {
bio_slab_max <<= 1; new_bio_slab_max = bio_slab_max << 1;
new_bio_slabs = krealloc(bio_slabs, new_bio_slabs = krealloc(bio_slabs,
bio_slab_max * sizeof(struct bio_slab), new_bio_slab_max * sizeof(struct bio_slab),
GFP_KERNEL); GFP_KERNEL);
if (!new_bio_slabs) if (!new_bio_slabs)
goto out_unlock; goto out_unlock;
bio_slab_max = new_bio_slab_max;
bio_slabs = new_bio_slabs; bio_slabs = new_bio_slabs;
} }
if (entry == -1) if (entry == -1)