Patchwork jbd2: use kmem_cache_zalloc for allocating journal head

login
register
mail settings
Submitter Zheng Liu
Date April 29, 2013, 9:08 a.m.
Message ID <1367226507-2990-1-git-send-email-wenqing.lz@taobao.com>
Download mbox | patch
Permalink /patch/240342/
State Accepted
Headers show

Comments

Zheng Liu - April 29, 2013, 9:08 a.m.
From: Zheng Liu <wenqing.lz@taobao.com>

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>
---
Hi Ted,

This patch could be folded into the commit: (28daf4fa)
    jbd2: use kmem_cache_zalloc instead of kmem_cache_alloc/memset

Regards,
						- Zheng

 fs/jbd2/journal.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
Theodore Ts'o - May 28, 2013, 11:28 a.m.
On Mon, Apr 29, 2013 at 05:08:27PM +0800, Zheng Liu wrote:
> From: Zheng Liu <wenqing.lz@taobao.com>
> 
> 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>

Thanks, added to the ext4 patch queue.

						- Ted
--
To unsubscribe from this list: send the line "unsubscribe linux-ext4" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index a62f57a..e90c0bf 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2327,13 +2327,13 @@  static struct journal_head *journal_alloc_journal_head(void)
 #ifdef CONFIG_JBD2_DEBUG
 	atomic_inc(&nr_journal_heads);
 #endif
-	ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS);
+	ret = kmem_cache_zalloc(jbd2_journal_head_cache, GFP_NOFS);
 	if (!ret) {
 		jbd_debug(1, "out of memory for journal_head\n");
 		pr_notice_ratelimited("ENOMEM in %s, retrying.\n", __func__);
 		while (!ret) {
 			yield();
-			ret = kmem_cache_alloc(jbd2_journal_head_cache, GFP_NOFS);
+			ret = kmem_cache_zalloc(jbd2_journal_head_cache, GFP_NOFS);
 		}
 	}
 	return ret;
@@ -2395,10 +2395,8 @@  struct journal_head *jbd2_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)) {