From: Michał Mirosław Use kzalloc() instead of kmalloc() + memset(). Signed-off-by: Michał Mirosław Signed-off-by: Alasdair G Kergon Signed-off-by: Andrew Morton --- drivers/md/dm-mpath.c | 17 ++++++----------- 1 files changed, 6 insertions(+), 11 deletions(-) diff -puN drivers/md/dm-mpath.c~dm-mpath-use-kzalloc drivers/md/dm-mpath.c --- a/drivers/md/dm-mpath.c~dm-mpath-use-kzalloc +++ a/drivers/md/dm-mpath.c @@ -114,12 +114,10 @@ static void trigger_event(void *data); static struct pgpath *alloc_pgpath(void) { - struct pgpath *pgpath = kmalloc(sizeof(*pgpath), GFP_KERNEL); + struct pgpath *pgpath = kzalloc(sizeof(*pgpath), GFP_KERNEL); - if (pgpath) { - memset(pgpath, 0, sizeof(*pgpath)); + if (pgpath) pgpath->path.is_active = 1; - } return pgpath; } @@ -133,12 +131,10 @@ static struct priority_group *alloc_prio { struct priority_group *pg; - pg = kmalloc(sizeof(*pg), GFP_KERNEL); - if (!pg) - return NULL; + pg = kzalloc(sizeof(*pg), GFP_KERNEL); - memset(pg, 0, sizeof(*pg)); - INIT_LIST_HEAD(&pg->pgpaths); + if (pg) + INIT_LIST_HEAD(&pg->pgpaths); return pg; } @@ -172,9 +168,8 @@ static struct multipath *alloc_multipath { struct multipath *m; - m = kmalloc(sizeof(*m), GFP_KERNEL); + m = kzalloc(sizeof(*m), GFP_KERNEL); if (m) { - memset(m, 0, sizeof(*m)); INIT_LIST_HEAD(&m->priority_groups); spin_lock_init(&m->lock); m->queue_io = 1; _