evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

jbd2: use kmem_cache_zalloc for allocating journal head

Browse source 
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: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
Zheng Liu 2013-05-28 07:27:11 -04:00 • committed by Theodore Ts'o
parent d23142c627
commit 5d9cf9c625
1 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
fs/jbd2/journal.c
View file

@ -2325,13 +2325,13 @@ static struct journal_head *journal_alloc_journal_head(void)
#ifdef CONFIG_JBD2_DEBUG #ifdef CONFIG_JBD2_DEBUG
atomic_inc(&nr_journal_heads); atomic_inc(&nr_journal_heads);
#endif #endif
ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); ret = kmem_cache_zalloc(jbd2_journal_head_cache, GFP_NOFS);
if (!ret) { if (!ret) {
jbd_debug(1, "out of memory for journal_head\n"); jbd_debug(1, "out of memory for journal_head\n");
pr_notice_ratelimited("ENOMEM in %s, retrying.\n", __func__); pr_notice_ratelimited("ENOMEM in %s, retrying.\n", __func__);
while (!ret) { while (!ret) {
yield(); yield();
ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS); ret = kmem_cache_zalloc(jbd2_journal_head_cache, GFP_NOFS);
} }
} }
return ret; return ret;
@ -2393,10 +2393,8 @@ struct journal_head *jbd2_journal_add_journal_head(struct buffer_head *bh)
struct journal_head *new_jh = NULL; struct journal_head *new_jh = NULL;
repeat: repeat:
if (!buffer_jbd(bh)) { if (!buffer_jbd(bh))
new_jh = journal_alloc_journal_head(); new_jh = journal_alloc_journal_head();
memset(new_jh, 0, sizeof(*new_jh));
}
jbd_lock_bh_journal_head(bh); jbd_lock_bh_journal_head(bh);
if (buffer_jbd(bh)) { if (buffer_jbd(bh)) {