Commit 045ce743 authored by Linus Torvalds's avatar Linus Torvalds

Merge tag 'dm-4.3-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm

Pull device mapper fixes from Mike Snitzer:
 "Two DM target error path cleanup fixes (one for stable in DM thinp and
  one for a v4.3-rc5 thinko in DM snapshot)"

* tag 'dm-4.3-fixes-3' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm:
  dm thin: fix missing pool reference count decrement in pool_ctr error path
  dm snapshot persistent: fix missing cleanup in persistent_ctr error path
parents 6aa8ca4d ba30670f
...@@ -847,6 +847,7 @@ static void persistent_drop_snapshot(struct dm_exception_store *store) ...@@ -847,6 +847,7 @@ static void persistent_drop_snapshot(struct dm_exception_store *store)
static int persistent_ctr(struct dm_exception_store *store, char *options) static int persistent_ctr(struct dm_exception_store *store, char *options)
{ {
struct pstore *ps; struct pstore *ps;
int r;
/* allocate the pstore */ /* allocate the pstore */
ps = kzalloc(sizeof(*ps), GFP_KERNEL); ps = kzalloc(sizeof(*ps), GFP_KERNEL);
...@@ -868,9 +869,9 @@ static int persistent_ctr(struct dm_exception_store *store, char *options) ...@@ -868,9 +869,9 @@ static int persistent_ctr(struct dm_exception_store *store, char *options)
ps->metadata_wq = alloc_workqueue("ksnaphd", WQ_MEM_RECLAIM, 0); ps->metadata_wq = alloc_workqueue("ksnaphd", WQ_MEM_RECLAIM, 0);
if (!ps->metadata_wq) { if (!ps->metadata_wq) {
kfree(ps);
DMERR("couldn't start header metadata update thread"); DMERR("couldn't start header metadata update thread");
return -ENOMEM; r = -ENOMEM;
goto err_workqueue;
} }
if (options) { if (options) {
...@@ -879,13 +880,21 @@ static int persistent_ctr(struct dm_exception_store *store, char *options) ...@@ -879,13 +880,21 @@ static int persistent_ctr(struct dm_exception_store *store, char *options)
store->userspace_supports_overflow = true; store->userspace_supports_overflow = true;
else { else {
DMERR("Unsupported persistent store option: %s", options); DMERR("Unsupported persistent store option: %s", options);
return -EINVAL; r = -EINVAL;
goto err_options;
} }
} }
store->context = ps; store->context = ps;
return 0; return 0;
err_options:
destroy_workqueue(ps->metadata_wq);
err_workqueue:
kfree(ps);
return r;
} }
static unsigned persistent_status(struct dm_exception_store *store, static unsigned persistent_status(struct dm_exception_store *store,
......
...@@ -3201,7 +3201,7 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv) ...@@ -3201,7 +3201,7 @@ static int pool_ctr(struct dm_target *ti, unsigned argc, char **argv)
metadata_low_callback, metadata_low_callback,
pool); pool);
if (r) if (r)
goto out_free_pt; goto out_flags_changed;
pt->callbacks.congested_fn = pool_is_congested; pt->callbacks.congested_fn = pool_is_congested;
dm_table_add_target_callbacks(ti->table, &pt->callbacks); dm_table_add_target_callbacks(ti->table, &pt->callbacks);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment