From 62706790b88b9ab2e27067ba3fb922da9db73dbc Mon Sep 17 00:00:00 2001 From: Zheng Liu Date: Fri, 12 Apr 2013 02:24:06 +0000 Subject: [PATCH] --- yaml --- r: 372151 b: refs/heads/master c: e162b2f835eeda0d255bd463753b5eb823735205 h: refs/heads/master i: 372149: 7d32017c8eb9aa8fa34c85650e0d5eddad32acc2 372147: 649102bc579f4b6a19994801cbbbfeceda60bb4a 372143: 99b6ba1f0732c544bc4e20b861c33305c7b312bb v: v3 --- [refs] | 2 +- trunk/fs/jbd/transaction.c | 1 - trunk/include/linux/jbd.h | 2 +- 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 7c85c0563977..9d2eaf4e5671 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e678a4f0f50d4fa4f7aaa6de8eb3f071513356a0 +refs/heads/master: e162b2f835eeda0d255bd463753b5eb823735205 diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c index 071d6905f0dd..e3e255c0a509 100644 --- a/trunk/fs/jbd/transaction.c +++ b/trunk/fs/jbd/transaction.c @@ -245,7 +245,6 @@ static handle_t *new_handle(int nblocks) handle_t *handle = jbd_alloc_handle(GFP_NOFS); if (!handle) return NULL; - memset(handle, 0, sizeof(*handle)); handle->h_buffer_credits = nblocks; handle->h_ref = 1; diff --git a/trunk/include/linux/jbd.h b/trunk/include/linux/jbd.h index c8f32975f0e4..7e0b622503c4 100644 --- a/trunk/include/linux/jbd.h +++ b/trunk/include/linux/jbd.h @@ -887,7 +887,7 @@ extern struct kmem_cache *jbd_handle_cache; static inline handle_t *jbd_alloc_handle(gfp_t gfp_flags) { - return kmem_cache_alloc(jbd_handle_cache, gfp_flags); + return kmem_cache_zalloc(jbd_handle_cache, gfp_flags); } static inline void jbd_free_handle(handle_t *handle)