diff options
| author | NeilBrown <neilb@suse.de> | 2014-12-15 02:56:58 +0100 |
|---|---|---|
| committer | NeilBrown <neilb@suse.de> | 2015-02-03 22:35:52 +0100 |
| commit | afa0f557cb15176570a18fb2a093e348a793afd4 (patch) | |
| tree | 7ae3f6a37ae3e6bcfbea51faadad924df8020095 /drivers/md/raid10.c | |
| parent | md: split detach operation out from ->stop. (diff) | |
| download | linux-afa0f557cb15176570a18fb2a093e348a793afd4.tar.xz linux-afa0f557cb15176570a18fb2a093e348a793afd4.zip | |
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>
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 654fdae906aa..d1203cddb024 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -3798,9 +3798,9 @@ out: return -EIO; } -static int stop(struct mddev *mddev) +static void raid10_free(struct mddev *mddev, void *priv) { - struct r10conf *conf = mddev->private; + struct r10conf *conf = priv; if (conf->r10bio_pool) mempool_destroy(conf->r10bio_pool); @@ -3809,8 +3809,6 @@ static int stop(struct mddev *mddev) kfree(conf->mirrors_old); kfree(conf->mirrors_new); kfree(conf); - mddev->private = NULL; - return 0; } static void raid10_quiesce(struct mddev *mddev, int state) @@ -4692,7 +4690,7 @@ static struct md_personality raid10_personality = .owner = THIS_MODULE, .make_request = make_request, .run = run, - .stop = stop, + .free = raid10_free, .status = status, .error_handler = error, .hot_add_disk = raid10_add_disk, |