From mboxrd@z Thu Jan 1 00:00:00 1970 From: Anna Leuschner Subject: [PATCH 1/1] vfs: bio.c: fix: increment capacity only if krealloc() succeeded Date: Sat, 8 Sep 2012 15:06:55 +0200 Message-ID: <1347109615-19556-1-git-send-email-anna.m.leuschner@gmail.com> Cc: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Anna Leuschner To: Alexander Viro Return-path: Sender: linux-kernel-owner@vger.kernel.org List-Id: linux-fsdevel.vger.kernel.org Fix: only increment bio_slab_max if bio_slabs reallocation succeeded Signed-off-by: Anna Leuschner --- fs/bio.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/fs/bio.c b/fs/bio.c index 71072ab..58707ff 100644 --- a/fs/bio.c +++ b/fs/bio.c @@ -74,6 +74,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, *new_bio_slabs; + unsigned int new_bio_slab_max; unsigned int i, entry = -1; mutex_lock(&bio_slab_lock); @@ -96,12 +97,13 @@ static struct kmem_cache *bio_find_or_create_slab(unsigned int extra_size) goto out_unlock; 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, - bio_slab_max * sizeof(struct bio_slab), + new_bio_slab_max * sizeof(struct bio_slab), GFP_KERNEL); if (!new_bio_slabs) goto out_unlock; + bio_slab_max = new_bio_slab_max; bio_slabs = new_bio_slabs; } if (entry == -1) -- 1.7.9.5