JBD/ext3 cleanups: convert to kzalloc

Convert kmalloc to kzalloc() and get rid of the memset(). Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

JBD/ext3 cleanups: convert to kzalloc
Convert kmalloc to kzalloc() and get rid of the memset(). Signed-off-by: Mingming Cao <cmm@us.ibm.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Mingming Cao · Linus Torvalds
1 parent 345225c8e4
Showing 3 changed files with 3 additions and 6 deletions Side-by-side Diff
fs/ext3/xattr.c
fs/jbd/journal.c
fs/jbd/transaction.c
@@ -741,12 +741,11 @@
 		}
 	} 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);
@@ -654,10 +654,9 @@
 	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);
@@ -96,13 +96,12 @@
  
 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);
...	...	@@ -741,12 +741,11 @@
741	741	}
742	742	} else {
743	743	/* Allocate a buffer where we construct the new block. */
744		- s->base = kmalloc(sb->s_blocksize, GFP_KERNEL);
	744	+ s->base = kzalloc(sb->s_blocksize, GFP_KERNEL);
745	745	/* assert(header == s->base) */
746	746	error = -ENOMEM;
747	747	if (s->base == NULL)
748	748	goto cleanup;
749		- memset(s->base, 0, sb->s_blocksize);
750	749	header(s->base)->h_magic = cpu_to_le32(EXT3_XATTR_MAGIC);
751	750	header(s->base)->h_blocks = cpu_to_le32(1);
752	751	header(s->base)->h_refcount = cpu_to_le32(1);
...	...	@@ -654,10 +654,9 @@
654	654	journal_t *journal;
655	655	int err;
656	656
657		- journal = kmalloc(sizeof(*journal), GFP_KERNEL);
	657	+ journal = kzalloc(sizeof(*journal), GFP_KERNEL);
658	658	if (!journal)
659	659	goto fail;
660		- memset(journal, 0, sizeof(*journal));
661	660
662	661	init_waitqueue_head(&journal->j_wait_transaction_locked);
663	662	init_waitqueue_head(&journal->j_wait_logspace);
...	...	@@ -96,13 +96,12 @@
96	96
97	97	alloc_transaction:
98	98	if (!journal->j_running_transaction) {
99		- new_transaction = kmalloc(sizeof(*new_transaction),
	99	+ new_transaction = kzalloc(sizeof(*new_transaction),
100	100	GFP_NOFS\|__GFP_NOFAIL);
101	101	if (!new_transaction) {
102	102	ret = -ENOMEM;
103	103	goto out;
104	104	}
105		- memset(new_transaction, 0, sizeof(*new_transaction));
106	105	}
107	106
108	107	jbd_debug(3, "New handle %p going live.\n", handle);