aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/linear.c
diff options
context:
space:
mode:
authorNeilBrown <neilb@suse.de>2014-12-14 20:56:58 -0500
committerNeilBrown <neilb@suse.de>2015-02-03 16:35:52 -0500
commitafa0f557cb15176570a18fb2a093e348a793afd4 (patch)
tree7ae3f6a37ae3e6bcfbea51faadad924df8020095 /drivers/md/linear.c
parent5aa61f427e4979be733e4847b9199ff9cc48a47e (diff)
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/linear.c')
-rw-r--r--drivers/md/linear.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/drivers/md/linear.c b/drivers/md/linear.c
index c201555b9c6c..fa7d577f3d12 100644
--- a/drivers/md/linear.c
+++ b/drivers/md/linear.c
@@ -249,14 +249,11 @@ static int linear_add(struct mddev *mddev, struct md_rdev *rdev)
249 return 0; 249 return 0;
250} 250}
251 251
252static int linear_stop (struct mddev *mddev) 252static void linear_free(struct mddev *mddev, void *priv)
253{ 253{
254 struct linear_conf *conf = mddev->private; 254 struct linear_conf *conf = priv;
255 255
256 kfree(conf); 256 kfree(conf);
257 mddev->private = NULL;
258
259 return 0;
260} 257}
261 258
262static void linear_make_request(struct mddev *mddev, struct bio *bio) 259static void linear_make_request(struct mddev *mddev, struct bio *bio)
@@ -335,7 +332,7 @@ static struct md_personality linear_personality =
335 .owner = THIS_MODULE, 332 .owner = THIS_MODULE,
336 .make_request = linear_make_request, 333 .make_request = linear_make_request,
337 .run = linear_run, 334 .run = linear_run,
338 .stop = linear_stop, 335 .free = linear_free,
339 .status = linear_status, 336 .status = linear_status,
340 .hot_add_disk = linear_add, 337 .hot_add_disk = linear_add,
341 .size = linear_size, 338 .size = linear_size,