From 15d6e7c71c63becf3058f0deac159f282c66765d Mon Sep 17 00:00:00 2001
From: Mingming Cao <cmm@us.ibm.com>
Date: Thu, 18 Oct 2007 23:39:20 -0700
Subject: [PATCH] --- yaml --- r: 71396 b: refs/heads/master c:
 8c3478a523a48470eb11a23f01249250684677d9 h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/fs/ext3/xattr.c      | 3 +--
 trunk/fs/jbd/journal.c     | 3 +--
 trunk/fs/jbd/transaction.c | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 8597902f036c..92b01f3f2a1f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 345225c8e4a4adad9eb261db26aebcd3b87055ad
+refs/heads/master: 8c3478a523a48470eb11a23f01249250684677d9
diff --git a/trunk/fs/ext3/xattr.c b/trunk/fs/ext3/xattr.c
index f58cbb26323e..408373819e34 100644
--- a/trunk/fs/ext3/xattr.c
+++ b/trunk/fs/ext3/xattr.c
@@ -741,12 +741,11 @@ ext3_xattr_block_set(handle_t *handle, struct inode *inode,
 		}
 	} else {
 		/* Allocate a buffer where we construct the new block. */
-		s->base = kmalloc(sb->s_blocksize, GFP_KERNEL);
+		s->base = kzalloc(sb->s_blocksize, GFP_KERNEL);
 		/* assert(header == s->base) */
 		error = -ENOMEM;
 		if (s->base == NULL)
 			goto cleanup;
-		memset(s->base, 0, sb->s_blocksize);
 		header(s->base)->h_magic = cpu_to_le32(EXT3_XATTR_MAGIC);
 		header(s->base)->h_blocks = cpu_to_le32(1);
 		header(s->base)->h_refcount = cpu_to_le32(1);
diff --git a/trunk/fs/jbd/journal.c b/trunk/fs/jbd/journal.c
index 5d9fec0b7ebd..f810047a7195 100644
--- a/trunk/fs/jbd/journal.c
+++ b/trunk/fs/jbd/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);
 	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/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c
index 9841b1e5af03..08ff6c7028cc 100644
--- a/trunk/fs/jbd/transaction.c
+++ b/trunk/fs/jbd/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);