diff options
| author | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-10-19 08:30:42 -0400 |
| commit | 5c04b426f2e8b46cfc7969a35b2631063a3c646c (patch) | |
| tree | 2d27d9f5d2fe5d5e8fbc01a467ec58bcb50235c1 /drivers/md/multipath.c | |
| parent | 499337bb6511e665a236a6a947f819d98ea340c6 (diff) | |
| parent | 899e3ee404961a90b828ad527573aaaac39f0ab1 (diff) | |
Merge branch 'v3.1-rc10' into for-3.2/core
Conflicts:
block/blk-core.c
include/linux/blkdev.h
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'drivers/md/multipath.c')
| -rw-r--r-- | drivers/md/multipath.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/md/multipath.c b/drivers/md/multipath.c index 407cb569142..618dd9e2251 100644 --- a/drivers/md/multipath.c +++ b/drivers/md/multipath.c | |||
| @@ -514,8 +514,7 @@ static int multipath_stop (mddev_t *mddev) | |||
| 514 | { | 514 | { |
| 515 | multipath_conf_t *conf = mddev->private; | 515 | multipath_conf_t *conf = mddev->private; |
| 516 | 516 | ||
| 517 | md_unregister_thread(mddev->thread); | 517 | md_unregister_thread(&mddev->thread); |
| 518 | mddev->thread = NULL; | ||
| 519 | blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ | 518 | blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ |
| 520 | mempool_destroy(conf->pool); | 519 | mempool_destroy(conf->pool); |
| 521 | kfree(conf->multipaths); | 520 | kfree(conf->multipaths); |