1 files changed, 9 insertions, 13 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 145cdc5ad008..e6aa309a66d7 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -35,15 +35,10 @@
 #define NR_RESERVED_BUFS        32
 
 
-static mdk_personality_t multipath_personality;
-
-
 static void *mp_pool_alloc(gfp_t gfp_flags, void *data)
 {
         struct multipath_bh *mpb;
-        mpb = kmalloc(sizeof(*mpb), gfp_flags);
-        if (mpb) 
-                memset(mpb, 0, sizeof(*mpb));
+        mpb = kzalloc(sizeof(*mpb), gfp_flags);
         return mpb;
 }
 
@@ -444,7 +439,7 @@ static int multipath_run (mddev_t *mddev)
          * should be freed in multipath_stop()]
          */
 
-        conf = kmalloc(sizeof(multipath_conf_t), GFP_KERNEL);
+        conf = kzalloc(sizeof(multipath_conf_t), GFP_KERNEL);
         mddev->private = conf;
         if (!conf) {
                 printk(KERN_ERR 
@@ -452,9 +447,8 @@ static int multipath_run (mddev_t *mddev)
                         mdname(mddev));
                 goto out;
         }
-        memset(conf, 0, sizeof(*conf));
 
-        conf->multipaths = kmalloc(sizeof(struct multipath_info)*mddev->raid_disks,
+        conf->multipaths = kzalloc(sizeof(struct multipath_info)*mddev->raid_disks,
                                    GFP_KERNEL);
         if (!conf->multipaths) {
                 printk(KERN_ERR 
@@ -462,7 +456,6 @@ static int multipath_run (mddev_t *mddev)
                         mdname(mddev));
                 goto out_free_conf;
         }
-        memset(conf->multipaths, 0, sizeof(struct multipath_info)*mddev->raid_disks);
 
         conf->working_disks = 0;
         ITERATE_RDEV(mddev,rdev,tmp) {
@@ -557,9 +550,10 @@ static int multipath_stop (mddev_t *mddev)
         return 0;
 }
 
-static mdk_personality_t multipath_personality=
+static struct mdk_personality multipath_personality =
 {
         .name           = "multipath",
+        .level          = LEVEL_MULTIPATH,
         .owner          = THIS_MODULE,
         .make_request   = multipath_make_request,
         .run            = multipath_run,
@@ -572,15 +566,17 @@ static mdk_personality_t multipath_personality=
 
 static int __init multipath_init (void)
 {
-        return register_md_personality (MULTIPATH, &multipath_personality);
+        return register_md_personality (&multipath_personality);
 }
 
 static void __exit multipath_exit (void)
 {
-        unregister_md_personality (MULTIPATH);
+        unregister_md_personality (&multipath_personality);
 }
 
 module_init(multipath_init);
 module_exit(multipath_exit);
 MODULE_LICENSE("GPL");
 MODULE_ALIAS("md-personality-7"); /* MULTIPATH */
+MODULE_ALIAS("md-multipath");
+MODULE_ALIAS("md-level--4");