diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 15:59:09 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2011-10-30 15:59:09 -0400 |
| commit | b8bc83971cc20cae3c3b65c26a804f350d74960c (patch) | |
| tree | 2573e6367e1806c298344fa023bb49a16cc4d1e4 /drivers/md/raid10.c | |
| parent | 11f0d9311c6e9ed928dc98ce6e9d14c0ee274b05 (diff) | |
| parent | bca7ab316edd819edd0e3d59f9ccb26c6b2173f5 (diff) | |
Merge branch 'pxa/devel' into next/devel2
Conflicts:
arch/arm/mach-s3c2416/s3c2416.c
Diffstat (limited to 'drivers/md/raid10.c')
| -rw-r--r-- | drivers/md/raid10.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index d7a8468ddeab..0cd9672cf9cb 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c | |||
| @@ -2955,7 +2955,7 @@ static int run(mddev_t *mddev) | |||
| 2955 | return 0; | 2955 | return 0; |
| 2956 | 2956 | ||
| 2957 | out_free_conf: | 2957 | out_free_conf: |
| 2958 | md_unregister_thread(mddev->thread); | 2958 | md_unregister_thread(&mddev->thread); |
| 2959 | if (conf->r10bio_pool) | 2959 | if (conf->r10bio_pool) |
| 2960 | mempool_destroy(conf->r10bio_pool); | 2960 | mempool_destroy(conf->r10bio_pool); |
| 2961 | safe_put_page(conf->tmppage); | 2961 | safe_put_page(conf->tmppage); |
| @@ -2973,8 +2973,7 @@ static int stop(mddev_t *mddev) | |||
| 2973 | raise_barrier(conf, 0); | 2973 | raise_barrier(conf, 0); |
| 2974 | lower_barrier(conf); | 2974 | lower_barrier(conf); |
| 2975 | 2975 | ||
| 2976 | md_unregister_thread(mddev->thread); | 2976 | md_unregister_thread(&mddev->thread); |
| 2977 | mddev->thread = NULL; | ||
| 2978 | blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ | 2977 | blk_sync_queue(mddev->queue); /* the unplug fn references 'conf'*/ |
| 2979 | if (conf->r10bio_pool) | 2978 | if (conf->r10bio_pool) |
| 2980 | mempool_destroy(conf->r10bio_pool); | 2979 | mempool_destroy(conf->r10bio_pool); |