diff options
| author | Zheng Liu <wenqing.lz@taobao.com> | 2013-04-29 17:08:51 +0800 |
|---|---|---|
| committer | Jan Kara <jack@suse.cz> | 2013-04-29 14:34:05 +0200 |
| commit | 8bb9da943a62f4ffaabba1ad745990260fbb39df (patch) | |
| tree | 7920bb9d78e4d4a2dbcb1e297472935d1d8ecbae /fs/jbd | |
| parent | e162b2f835eeda0d255bd463753b5eb823735205 (diff) | |
| download | linux-8bb9da943a62f4ffaabba1ad745990260fbb39df.tar.bz2 | |
jbd: use kmem_cache_zalloc for allocating journal head
This commit tries to use kmem_cache_zalloc instead of kmem_cache_alloc/
memset when a new journal head is alloctated.
Signed-off-by: Zheng Liu <wenqing.lz@taobao.com>
Cc: Jan Kara <jack@suse.cz>
Signed-off-by: Jan Kara <jack@suse.cz>
Diffstat (limited to 'fs/jbd')
| -rw-r--r-- | fs/jbd/journal.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index 81880c6d6b5e..726a4432cbb1 100644 --- a/fs/jbd/journal.c +++ b/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)) { |