From 50181d7128598c05142c0fc50b353bbe6c61e30d Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Mon, 29 Apr 2013 17:08:51 +0800 Subject: [PATCH] --- yaml --- r: 372152 b: refs/heads/master c: 8bb9da943a62f4ffaabba1ad745990260fbb39df h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/journal.c | 8 +++----- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 9d2eaf4e5671..dd37c52dd9c1 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e162b2f835eeda0d255bd463753b5eb823735205 +refs/heads/master: 8bb9da943a62f4ffaabba1ad745990260fbb39df diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c index 81880c6d6b5e..726a4432cbb1 100644 --- a/trunk/fs/jbd/journal.c +++ b/trunk/fs/jbd/journal.c @@ -1856,7 +1856,7 @@ static struct journal_head *journal_alloc_journal_head(void) #ifdef CONFIG_JBD_DEBUG atomic_inc(&nr_journal_heads); #endif - ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS); + ret = kmem_cache_zalloc(journal_head_cache, GFP_NOFS); if (ret == NULL) { jbd_debug(1, "out of memory for journal_head\n"); printk_ratelimited(KERN_NOTICE "ENOMEM in %s, retrying.\n", @@ -1864,7 +1864,7 @@ static struct journal_head *journal_alloc_journal_head(void) while (ret == NULL) { yield(); - ret = kmem_cache_alloc(journal_head_cache, GFP_NOFS); + ret = kmem_cache_zalloc(journal_head_cache, GFP_NOFS); } } return ret; @@ -1926,10 +1926,8 @@ struct journal_head *journal_add_journal_head(struct buffer_head *bh) struct journal_head *new_jh = NULL; repeat: - if (!buffer_jbd(bh)) { + if (!buffer_jbd(bh)) new_jh = journal_alloc_journal_head(); - memset(new_jh, 0, sizeof(*new_jh)); - } jbd_lock_bh_journal_head(bh); if (buffer_jbd(bh)) {