md: rename ->stop to ->free

Now that the ->stop function only frees the private data,
rename is accordingly.

Also pass in the private pointer as an arg rather than using
mddev->private.  This flexibility will be useful in level_store().

Finally, don't clear ->private.  It doesn't make sense to clear
it seeing that isn't what we free, and it is no longer necessary
to clear ->private (it was some time ago before  ->to_remove was
introduced).

Setting ->to_remove in ->free() is a bit of a wart, but not a
big problem at the moment.

Signed-off-by: NeilBrown <neilb@suse.de>

1 files changed, 4 insertions, 6 deletions

diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c
index 9fe34453835b..ac3ede2bd00e 100644
--- a/drivers/md/multipath.c
+++ b/drivers/md/multipath.c
@@ -399,7 +399,7 @@ static int multipath_run (struct mddev *mddev)
         /*
          * copy the already verified devices into our private MULTIPATH
          * bookkeeping area. [whatever we allocate in multipath_run(),
-         * should be freed in multipath_stop()]
+         * should be freed in multipath_free()]
          */
 
         conf = kzalloc(sizeof(struct mpconf), GFP_KERNEL);
@@ -500,15 +500,13 @@ out:
         return -EIO;
 }
 
-static int multipath_stop (struct mddev *mddev)
+static void multipath_free(struct mddev *mddev, void *priv)
 {
-        struct mpconf *conf = mddev->private;
+        struct mpconf *conf = priv;
 
         mempool_destroy(conf->pool);
         kfree(conf->multipaths);
         kfree(conf);
-        mddev->private = NULL;
-        return 0;
 }
 
 static struct md_personality multipath_personality =
@@ -518,7 +516,7 @@ static struct md_personality multipath_personality =
         .owner          = THIS_MODULE,
         .make_request   = multipath_make_request,
         .run            = multipath_run,
-        .stop           = multipath_stop,
+        .free           = multipath_free,
         .status         = multipath_status,
         .error_handler  = multipath_error,
         .hot_add_disk   = multipath_add_disk,