dm: use kzalloc

Convert kmalloc() + memset() to kzalloc().

Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>

5 files changed, 9 insertions, 18 deletions

diff --git a/drivers/md/dm-emc.c b/drivers/md/dm-emc.c
index 342517261ece..ed28fe2072f0 100644
--- a/drivers/md/dm-emc.c
+++ b/drivers/md/dm-emc.c
@@ -211,12 +211,10 @@ fail_path:
 
 static struct emc_handler *alloc_emc_handler(void)
 {
-        struct emc_handler *h = kmalloc(sizeof(*h), GFP_KERNEL);
+        struct emc_handler *h = kzalloc(sizeof(*h), GFP_KERNEL);
 
-        if (h) {
-                memset(h, 0, sizeof(*h));
+        if (h)
                 spin_lock_init(&h->lock);
-        }
 
         return h;
 }
diff --git a/drivers/md/dm-hw-handler.c b/drivers/md/dm-hw-handler.c
index baafaaba4d4b..2ee84d8aa0bf 100644
--- a/drivers/md/dm-hw-handler.c
+++ b/drivers/md/dm-hw-handler.c
@@ -91,12 +91,10 @@ void dm_put_hw_handler(struct hw_handler_type *hwht)
 
 static struct hwh_internal *_alloc_hw_handler(struct hw_handler_type *hwht)
 {
-        struct hwh_internal *hwhi = kmalloc(sizeof(*hwhi), GFP_KERNEL);
+        struct hwh_internal *hwhi = kzalloc(sizeof(*hwhi), GFP_KERNEL);
 
-        if (hwhi) {
-                memset(hwhi, 0, sizeof(*hwhi));
+        if (hwhi)
                 hwhi->hwht = *hwht;
-        }
 
         return hwhi;
 }
diff --git a/drivers/md/dm-path-selector.c b/drivers/md/dm-path-selector.c
index f10a0c89b3f4..ca1bb636a3e4 100644
--- a/drivers/md/dm-path-selector.c
+++ b/drivers/md/dm-path-selector.c
@@ -94,12 +94,10 @@ out:
 
 static struct ps_internal *_alloc_path_selector(struct path_selector_type *pst)
 {
-        struct ps_internal *psi = kmalloc(sizeof(*psi), GFP_KERNEL);
+        struct ps_internal *psi = kzalloc(sizeof(*psi), GFP_KERNEL);
 
-        if (psi) {
-                memset(psi, 0, sizeof(*psi));
+        if (psi)
                 psi->pst = *pst;
-        }
 
         return psi;
 }
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index fbe477bb2c68..8939e6105088 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -213,12 +213,11 @@ static int alloc_targets(struct dm_table *t, unsigned int num)
 int dm_table_create(struct dm_table **result, int mode,
                     unsigned num_targets, struct mapped_device *md)
 {
-        struct dm_table *t = kmalloc(sizeof(*t), GFP_KERNEL);
+        struct dm_table *t = kzalloc(sizeof(*t), GFP_KERNEL);
 
         if (!t)
                 return -ENOMEM;
 
-        memset(t, 0, sizeof(*t));
         INIT_LIST_HEAD(&t->devices);
         atomic_set(&t->holders, 1);
 
diff --git a/drivers/md/dm-target.c b/drivers/md/dm-target.c
index 477a041a41cf..835cf95b857f 100644
--- a/drivers/md/dm-target.c
+++ b/drivers/md/dm-target.c
@@ -88,12 +88,10 @@ void dm_put_target_type(struct target_type *t)
 
 static struct tt_internal *alloc_target(struct target_type *t)
 {
-        struct tt_internal *ti = kmalloc(sizeof(*ti), GFP_KERNEL);
+        struct tt_internal *ti = kzalloc(sizeof(*ti), GFP_KERNEL);
 
-        if (ti) {
-                memset(ti, 0, sizeof(*ti));
+        if (ti)
                 ti->tt = *t;
-        }
 
         return ti;
 }