Skip to content

Commit

Permalink
JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4
Browse files Browse the repository at this point in the history
Convert kmalloc to kzalloc() and get rid of the memset().

Signed-off-by: Mingming Cao <cmm@us.ibm.com>
  • Loading branch information
Mingming Cao authored and Theodore Ts'o committed Oct 17, 2007
1 parent 2d91796 commit d802ffa
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions fs/ext4/xattr.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions fs/jbd2/journal.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions fs/jbd2/transaction.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit d802ffa

Please sign in to comment.