From: Mingming Cao Convert kmalloc to kzalloc() and get rid of the memset(). Signed-off-by: Mingming Cao Signed-off-by: Andrew Morton --- diff -puN fs/ext4/xattr.c~jbd2-ext4-cleanups-convert-to-kzalloc fs/ext4/xattr.c --- a/fs/ext4/xattr.c~jbd2-ext4-cleanups-convert-to-kzalloc +++ a/fs/ext4/xattr.c @@ -750,12 +750,11 @@ ext4_xattr_block_set(handle_t *handle, s } } 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(EXT4_XATTR_MAGIC); header(s->base)->h_blocks = cpu_to_le32(1); header(s->base)->h_refcount = cpu_to_le32(1); diff -puN fs/jbd2/journal.c~jbd2-ext4-cleanups-convert-to-kzalloc fs/jbd2/journal.c --- a/fs/jbd2/journal.c~jbd2-ext4-cleanups-convert-to-kzalloc +++ a/fs/jbd2/journal.c @@ -955,10 +955,9 @@ static journal_t * journal_init_common ( 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 -puN fs/jbd2/transaction.c~jbd2-ext4-cleanups-convert-to-kzalloc fs/jbd2/transaction.c --- a/fs/jbd2/transaction.c~jbd2-ext4-cleanups-convert-to-kzalloc +++ a/fs/jbd2/transaction.c @@ -99,12 +99,11 @@ static int start_this_handle(journal_t * alloc_transaction: if (!journal->j_running_transaction) { - new_transaction = kmalloc(sizeof(*new_transaction), GFP_NOFS); + new_transaction = kzalloc(sizeof(*new_transaction), GFP_NOFS); if (!new_transaction) { ret = -ENOMEM; goto out; } - memset(new_transaction, 0, sizeof(*new_transaction)); } jbd_debug(3, "New handle %p going live.\n", handle); _