The patch titled
JBD/ext3 cleanups: convert to kzalloc
has been added to the -mm tree. Its filename is
jbd-ext3-cleanups-convert-to-kzalloc.patch
*** Remember to use Documentation/SubmitChecklist when testing your code ***
See http://www.zip.com.au/~akpm/linux/patches/stuff/added-to-mm.txt to find
out what to do about this
------------------------------------------------------
Subject: JBD/ext3 cleanups: convert to kzalloc
From: Mingming Cao <cmm@xxxxxxxxxx>
Convert kmalloc to kzalloc() and get rid of the memset().
Signed-off-by: Mingming Cao <cmm@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
diff -puN fs/ext3/xattr.c~jbd-ext3-cleanups-convert-to-kzalloc fs/ext3/xattr.c
--- a/fs/ext3/xattr.c~jbd-ext3-cleanups-convert-to-kzalloc
+++ a/fs/ext3/xattr.c
@@ -741,12 +741,11 @@ ext3_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(EXT3_XATTR_MAGIC);
header(s->base)->h_blocks = cpu_to_le32(1);
header(s->base)->h_refcount = cpu_to_le32(1);
diff -puN fs/jbd/journal.c~jbd-ext3-cleanups-convert-to-kzalloc fs/jbd/journal.c
--- a/fs/jbd/journal.c~jbd-ext3-cleanups-convert-to-kzalloc
+++ a/fs/jbd/journal.c
@@ -653,10 +653,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/jbd/transaction.c~jbd-ext3-cleanups-convert-to-kzalloc fs/jbd/transaction.c
--- a/fs/jbd/transaction.c~jbd-ext3-cleanups-convert-to-kzalloc
+++ a/fs/jbd/transaction.c
@@ -96,12 +96,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);
_
Patches currently in -mm which might be from cmm@xxxxxxxxxx are
convert-ill-defined-log2-to-ilog2.patch
ext2-ext3-ext4-add-block-bitmap-validation.patch
ext2-ext3-ext4-add-block-bitmap-validation-fix.patch
jbd-slab-cleanups.patch
jbd-slab-cleanups-2.patch
jbd-slab-cleanups-3.patch
jbd-ext3-cleanups-convert-to-kzalloc.patch
ext2-reservations.patch
fix-for-ext2-reservation.patch
ext2-balloc-use-io_error-label.patch
ext4-uninitialized-block-groups.patch
ext4-uninitialized-block-groups-fix.patch
jbd2-ext4-naming-cleanup.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
