2 files changed, 2 insertions, 4 deletions

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 0e329a31c912..f12c65b81456 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -654,10 +654,9 @@ static journal_t * journal_init_common (void)
         journal_t *journal;
         int err;
 
-        journal = kmalloc(sizeof(*journal), GFP_KERNEL);
+        journal = kzalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
         if (!journal)
                 goto fail;
-        memset(journal, 0, sizeof(*journal));
 
         init_waitqueue_head(&journal->j_wait_transaction_locked);
         init_waitqueue_head(&journal->j_wait_logspace);
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c
index a5fb70fb5621..b1fcf2b3dca3 100644
--- a/fs/jbd2/transaction.c
+++ b/fs/jbd2/transaction.c
@@ -96,13 +96,12 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
 
 alloc_transaction:
         if (!journal->j_running_transaction) {
-                new_transaction = kmalloc(sizeof(*new_transaction),
+                new_transaction = kzalloc(sizeof(*new_transaction),
                                                 GFP_NOFS|__GFP_NOFAIL);
                 if (!new_transaction) {
                         ret = -ENOMEM;
                         goto out;
                 }
-                memset(new_transaction, 0, sizeof(*new_transaction));
         }
 
         jbd_debug(3, "New handle %p going live.\n", handle);