lkml.org 
[lkml]   [2007]   [Sep]   [21]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Subject[PATCH] JBD/ext34 cleanups: convert to kzalloc
    From
    Date
    Convert kmalloc to kzalloc() and get rid of the memset().

    Signed-off-by: Mingming Cao <cmm@us.ibm.com>
    ---
    fs/ext3/xattr.c | 3 +--
    fs/ext4/xattr.c | 3 +--
    fs/jbd/journal.c | 3 +--
    fs/jbd/transaction.c | 2 +-
    fs/jbd2/journal.c | 3 +--
    fs/jbd2/transaction.c | 2 +-
    6 files changed, 6 insertions(+), 10 deletions(-)

    Index: linux-2.6.23-rc6/fs/jbd/journal.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/jbd/journal.c 2007-09-21 09:08:02.000000000
    -0700
    +++ linux-2.6.23-rc6/fs/jbd/journal.c 2007-09-21 09:10:37.000000000
    -0700
    @@ -653,10 +653,9 @@ static journal_t * journal_init_common (
    journal_t *journal;
    int err;

    - journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
    + 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);
    Index: linux-2.6.23-rc6/fs/jbd/transaction.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/jbd/transaction.c 2007-09-21
    09:13:11.000000000 -0700
    +++ linux-2.6.23-rc6/fs/jbd/transaction.c 2007-09-21 09:13:24.000000000
    -0700
    @@ -96,7 +96,7 @@ static int start_this_handle(journal_t *

    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;
    Index: linux-2.6.23-rc6/fs/jbd2/journal.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/jbd2/journal.c 2007-09-21
    09:10:53.000000000 -0700
    +++ linux-2.6.23-rc6/fs/jbd2/journal.c 2007-09-21 09:11:13.000000000
    -0700
    @@ -654,10 +654,9 @@ static journal_t * journal_init_common (
    journal_t *journal;
    int err;

    - journal = kmalloc(sizeof(*journal), GFP_KERNEL|__GFP_NOFAIL);
    + 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);
    Index: linux-2.6.23-rc6/fs/jbd2/transaction.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/jbd2/transaction.c 2007-09-21
    09:12:46.000000000 -0700
    +++ linux-2.6.23-rc6/fs/jbd2/transaction.c 2007-09-21 09:12:59.000000000
    -0700
    @@ -96,7 +96,7 @@ static int start_this_handle(journal_t *

    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;
    Index: linux-2.6.23-rc6/fs/ext3/xattr.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/ext3/xattr.c 2007-09-21 10:22:24.000000000
    -0700
    +++ linux-2.6.23-rc6/fs/ext3/xattr.c 2007-09-21 10:24:19.000000000 -0700
    @@ -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);
    Index: linux-2.6.23-rc6/fs/ext4/xattr.c
    ===================================================================
    --- linux-2.6.23-rc6.orig/fs/ext4/xattr.c 2007-09-21 10:20:21.000000000
    -0700
    +++ linux-2.6.23-rc6/fs/ext4/xattr.c 2007-09-21 10:21:00.000000000 -0700
    @@ -750,12 +750,11 @@ ext4_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(EXT4_XATTR_MAGIC);
    header(s->base)->h_blocks = cpu_to_le32(1);
    header(s->base)->h_refcount = cpu_to_le32(1);

    -
    To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
    the body of a message to majordomo@vger.kernel.org
    More majordomo info at http://vger.kernel.org/majordomo-info.html
    Please read the FAQ at http://www.tux.org/lkml/

    \
     
     \ /
      Last update: 2007-09-22 01:17    [W:0.025 / U:34.768 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site