mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
JBD2/Ext4: Convert kmalloc to kzalloc in jbd2/ext4
Convert kmalloc to kzalloc() and get rid of the memset(). Signed-off-by: Mingming Cao <[email protected]>
This commit is contained in:
parent
2d917969bc
commit
d802ffa885
3 changed files with 3 additions and 6 deletions
|
|
@ -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);
|
||||
|
|
|
|||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in a new issue