diff options
Diffstat (limited to 'drivers/md/raid5.c')
-rw-r--r-- | drivers/md/raid5.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c index 482526077647..dab908b2aa9a 100644 --- a/drivers/md/raid5.c +++ b/drivers/md/raid5.c | |||
@@ -6313,14 +6313,12 @@ abort: | |||
6313 | return -EIO; | 6313 | return -EIO; |
6314 | } | 6314 | } |
6315 | 6315 | ||
6316 | static int stop(struct mddev *mddev) | 6316 | static void raid5_free(struct mddev *mddev, void *priv) |
6317 | { | 6317 | { |
6318 | struct r5conf *conf = mddev->private; | 6318 | struct r5conf *conf = priv; |
6319 | 6319 | ||
6320 | free_conf(conf); | 6320 | free_conf(conf); |
6321 | mddev->private = NULL; | ||
6322 | mddev->to_remove = &raid5_attrs_group; | 6321 | mddev->to_remove = &raid5_attrs_group; |
6323 | return 0; | ||
6324 | } | 6322 | } |
6325 | 6323 | ||
6326 | static void status(struct seq_file *seq, struct mddev *mddev) | 6324 | static void status(struct seq_file *seq, struct mddev *mddev) |
@@ -7094,7 +7092,7 @@ static struct md_personality raid6_personality = | |||
7094 | .owner = THIS_MODULE, | 7092 | .owner = THIS_MODULE, |
7095 | .make_request = make_request, | 7093 | .make_request = make_request, |
7096 | .run = run, | 7094 | .run = run, |
7097 | .stop = stop, | 7095 | .free = raid5_free, |
7098 | .status = status, | 7096 | .status = status, |
7099 | .error_handler = error, | 7097 | .error_handler = error, |
7100 | .hot_add_disk = raid5_add_disk, | 7098 | .hot_add_disk = raid5_add_disk, |
@@ -7118,7 +7116,7 @@ static struct md_personality raid5_personality = | |||
7118 | .owner = THIS_MODULE, | 7116 | .owner = THIS_MODULE, |
7119 | .make_request = make_request, | 7117 | .make_request = make_request, |
7120 | .run = run, | 7118 | .run = run, |
7121 | .stop = stop, | 7119 | .free = raid5_free, |
7122 | .status = status, | 7120 | .status = status, |
7123 | .error_handler = error, | 7121 | .error_handler = error, |
7124 | .hot_add_disk = raid5_add_disk, | 7122 | .hot_add_disk = raid5_add_disk, |
@@ -7143,7 +7141,7 @@ static struct md_personality raid4_personality = | |||
7143 | .owner = THIS_MODULE, | 7141 | .owner = THIS_MODULE, |
7144 | .make_request = make_request, | 7142 | .make_request = make_request, |
7145 | .run = run, | 7143 | .run = run, |
7146 | .stop = stop, | 7144 | .free = raid5_free, |
7147 | .status = status, | 7145 | .status = status, |
7148 | .error_handler = error, | 7146 | .error_handler = error, |
7149 | .hot_add_disk = raid5_add_disk, | 7147 | .hot_add_disk = raid5_add_disk, |