openharmony/kernel_linux
1
0
Fork 0
mirror of https://gitee.com/openharmony/kernel_linux synced 2024-12-15 10:53:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

JBD/ext3 cleanups: convert to kzalloc

Browse Source 
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>
This commit is contained in:
Mingming Cao 2007-10-18 23:39:20 -07:00 committed by Linus Torvalds
parent 345225c8e4
commit 8c3478a523
3 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs/ext3/xattr.c
View File

@ -741,12 +741,11 @@ ext3_xattr_block_set(handle_t *handle, struct inode *inode,
} }
} else { } else {
/* Allocate a buffer where we construct the new block. */ /* 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) */ /* assert(header == s->base) */
error = -ENOMEM; error = -ENOMEM;
if (s->base == NULL) if (s->base == NULL)
goto cleanup; goto cleanup;
memset(s->base, 0, sb->s_blocksize);
header(s->base)->h_magic = cpu_to_le32(EXT3_XATTR_MAGIC); header(s->base)->h_magic = cpu_to_le32(EXT3_XATTR_MAGIC);
header(s->base)->h_blocks = cpu_to_le32(1); header(s->base)->h_blocks = cpu_to_le32(1);
header(s->base)->h_refcount = cpu_to_le32(1); header(s->base)->h_refcount = cpu_to_le32(1);

3
fs/jbd/journal.c
View File

@ -654,10 +654,9 @@ static journal_t * journal_init_common (void)
journal_t *journal; journal_t *journal;
int err; int err;
journal = kmalloc(sizeof(*journal), GFP_KERNEL); journal = kzalloc(sizeof(*journal), GFP_KERNEL);
if (!journal) if (!journal)
goto fail; goto fail;
memset(journal, 0, sizeof(*journal));
init_waitqueue_head(&journal->j_wait_transaction_locked); init_waitqueue_head(&journal->j_wait_transaction_locked);
init_waitqueue_head(&journal->j_wait_logspace); init_waitqueue_head(&journal->j_wait_logspace);

3
fs/jbd/transaction.c
View File

@ -96,13 +96,12 @@ static int start_this_handle(journal_t *journal, handle_t *handle)
alloc_transaction: alloc_transaction:
if (!journal->j_running_transaction) { if (!journal->j_running_transaction) {
new_transaction = kmalloc(sizeof(*new_transaction), new_transaction = kzalloc(sizeof(*new_transaction),
GFP_NOFS|__GFP_NOFAIL); GFP_NOFS|__GFP_NOFAIL);
if (!new_transaction) { if (!new_transaction) {
ret = -ENOMEM; ret = -ENOMEM;
goto out; goto out;
} }
memset(new_transaction, 0, sizeof(*new_transaction));
} }
jbd_debug(3, "New handle %p going live.\n", handle); jbd_debug(3, "New handle %p going live.\n", handle);