lkml.org 
[lkml]   [2006]   [Dec]   [3]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[PATCH] fs: Convert kmalloc()+memset() combo to kzalloc().

    Convert all obvious combinations of kmalloc()+memset() to single
    kzalloc() in the fs/ directory.

    Signed-off-by: Robert P. J. Day <rpjday@mindspring.com>

    ---

    binfmt_elf_fdpic.c | 3 +--
    seq_file.c | 3 +--
    2 files changed, 2 insertions(+), 4 deletions(-)

    diff --git a/fs/binfmt_elf_fdpic.c b/fs/binfmt_elf_fdpic.c
    index f86d5c9..789c1c6 100644
    --- a/fs/binfmt_elf_fdpic.c
    +++ b/fs/binfmt_elf_fdpic.c
    @@ -709,12 +709,11 @@ #endif
    return -ELIBBAD;

    size = sizeof(*loadmap) + nloads * sizeof(*seg);
    - loadmap = kmalloc(size, GFP_KERNEL);
    + loadmap = kzalloc(size, GFP_KERNEL);
    if (!loadmap)
    return -ENOMEM;

    params->loadmap = loadmap;
    - memset(loadmap, 0, size);

    loadmap->version = ELF32_FDPIC_LOADMAP_VERSION;
    loadmap->nsegs = nloads;
    diff --git a/fs/seq_file.c b/fs/seq_file.c
    index 555b9ac..f85feba 100644
    --- a/fs/seq_file.c
    +++ b/fs/seq_file.c
    @@ -31,12 +31,11 @@ int seq_open(struct file *file, struct s
    struct seq_file *p = file->private_data;

    if (!p) {
    - p = kmalloc(sizeof(*p), GFP_KERNEL);
    + p = kzalloc(sizeof(*p), GFP_KERNEL);
    if (!p)
    return -ENOMEM;
    file->private_data = p;
    }
    - memset(p, 0, sizeof(*p));
    mutex_init(&p->lock);
    p->op = op;

    -
    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: 2006-12-03 17:27    [W:0.031 / U:31.652 seconds]
    ©2003-2016 Jasper Spaans. hosted at Digital OceanAdvertise on this site