From fb962c55b8a88bc6c38a0072a79d8f66fd2921c1 Mon Sep 17 00:00:00 2001 From: Wanlong Gao Date: Fri, 1 Jun 2012 00:10:32 -0400 Subject: [PATCH] --- yaml --- r: 309972 b: refs/heads/master c: b2f4edb335f23626225a792e0669d1becf68312f h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd2/transaction.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index dac480c7eb78..3030aa3c2b0a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 95599968d19db175829fb580baa6b68939b320fb +refs/heads/master: b2f4edb335f23626225a792e0669d1becf68312f diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c index ddcd3549c6c2..fb1ab9533b67 100644 --- a/trunk/fs/jbd2/transaction.c +++ b/trunk/fs/jbd2/transaction.c @@ -162,8 +162,8 @@ static int start_this_handle(journal_t *journal, handle_t *handle, alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = kmem_cache_alloc(transaction_cache, - gfp_mask | __GFP_ZERO); + new_transaction = kmem_cache_zalloc(transaction_cache, + gfp_mask); if (!new_transaction) { /* * If __GFP_FS is not present, then we may be