Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d802ffa8 authored by Mingming Cao's avatar Mingming Cao Committed by Theodore Ts'o
Browse files

JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4 



Convert kmalloc to kzalloc() and get rid of the memset().

Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
parent 2d917969

fs/ext4/xattr.c

+1 −2
Original line number Diff line number Diff line
@@ -750,12 +750,11 @@ ext4_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(EXT4_XATTR_MAGIC);

		header(s->base)->h_blocks = cpu_to_le32(1);

		header(s->base)->h_refcount = cpu_to_le32(1);

fs/jbd2/journal.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

fs/jbd2/transaction.c

+1 −2
Original line number Diff line number Diff line
@@ -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);