diff options
author | Shenghui Wang <shhuiw@foxmail.com> | 2018-10-07 02:45:41 -0400 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2018-10-09 13:53:03 -0400 |
commit | c7cd55504a5b0fc826a2cd9540845979d24ae542 (patch) | |
tree | 4a9cff7ad26a5797094f792bed90ccb5695f6247 | |
parent | 0238df646e6224016a45505d2c111a24669ebe21 (diff) |
dm cache: destroy migration_cache if cache target registration failed
Commit 7e6358d244e47 ("dm: fix various targets to dm_register_target
after module __init resources created") inadvertently introduced this
bug when it moved dm_register_target() after the call to KMEM_CACHE().
Fixes: 7e6358d244e47 ("dm: fix various targets to dm_register_target after module __init resources created")
Cc: stable@vger.kernel.org
Signed-off-by: Shenghui Wang <shhuiw@foxmail.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r-- | drivers/md/dm-cache-target.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c index e13d991e9fb5..b29a8327eed1 100644 --- a/drivers/md/dm-cache-target.c +++ b/drivers/md/dm-cache-target.c | |||
@@ -3484,14 +3484,13 @@ static int __init dm_cache_init(void) | |||
3484 | int r; | 3484 | int r; |
3485 | 3485 | ||
3486 | migration_cache = KMEM_CACHE(dm_cache_migration, 0); | 3486 | migration_cache = KMEM_CACHE(dm_cache_migration, 0); |
3487 | if (!migration_cache) { | 3487 | if (!migration_cache) |
3488 | dm_unregister_target(&cache_target); | ||
3489 | return -ENOMEM; | 3488 | return -ENOMEM; |
3490 | } | ||
3491 | 3489 | ||
3492 | r = dm_register_target(&cache_target); | 3490 | r = dm_register_target(&cache_target); |
3493 | if (r) { | 3491 | if (r) { |
3494 | DMERR("cache target registration failed: %d", r); | 3492 | DMERR("cache target registration failed: %d", r); |
3493 | kmem_cache_destroy(migration_cache); | ||
3495 | return r; | 3494 | return r; |
3496 | } | 3495 | } |
3497 | 3496 | ||