From: Heinz Mauelshagen <heinzm@redhat.com>
Date: Wed, 20 Mar 2013 17:21:26 +0000 (+0000)
Subject: dm cache: avoid calling policy destructor twice on error
X-Git-Tag: Ubuntu-snapdragon-4.4.0-1029.32~11309^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=b978440b8db901aba0c4cd38c7c841c9b5cd9a7e;p=mirror_ubuntu-zesty-kernel.git

dm cache: avoid calling policy destructor twice on error

If the cache policy's config values are not able to be set we must
set the policy to NULL after destroying it in create_cache_policy()
so we don't attempt to destroy it a second time later.

Signed-off-by: Heinz Mauelshagen <heinzm@redhat.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
Signed-off-by: Alasdair G Kergon <agk@redhat.com>
---

diff --git a/drivers/md/dm-cache-target.c b/drivers/md/dm-cache-target.c
index 76cc910557f0..79ac8603644d 100644
--- a/drivers/md/dm-cache-target.c
+++ b/drivers/md/dm-cache-target.c
@@ -1763,8 +1763,11 @@ static int create_cache_policy(struct cache *cache, struct cache_args *ca,
 	}
 
 	r = set_config_values(cache->policy, ca->policy_argc, ca->policy_argv);
-	if (r)
+	if (r) {
+		*error = "Error setting cache policy's config values";
 		dm_cache_policy_destroy(cache->policy);
+		cache->policy = NULL;
+	}
 
 	return r;
 }