From: Anna Leuschner <anna.m.leuschner@gmail.com>
To: kernel-janitors@vger.kernel.org
Cc: Jens Axboe <axboe@kernel.dk>,
linux-kernel@vger.kernel.org,
Anna Leuschner <anna.m.leuschner@gmail.com>
Subject: [PATCH] vfs: fix: don't increase bio_slab_max if krealloc() fails
Date: Sun, 21 Oct 2012 22:33:29 +0200 [thread overview]
Message-ID: <1350851609-10541-1-git-send-email-anna.m.leuschner@gmail.com> (raw)
bio.c: fix: don't increase bio_slab_max if krealloc() of bio_slabs fails
Signed-off-by: Anna Leuschner <anna.m.leuschner@gmail.com>
---
fs/bio.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/fs/bio.c b/fs/bio.c
index 9298c65..b96fc6c 100644
--- a/fs/bio.c
+++ b/fs/bio.c
@@ -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;
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);
@@ -97,12 +98,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.10.4
next reply other threads:[~2012-10-21 20:34 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-21 20:33 Anna Leuschner [this message]
2012-10-22 18:40 ` [PATCH] vfs: fix: don't increase bio_slab_max if krealloc() fails Jens Axboe
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1350851609-10541-1-git-send-email-anna.m.leuschner@gmail.com \
--to=anna.m.leuschner@gmail.com \
--cc=axboe@kernel.dk \
--cc=kernel-janitors@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).