diff options
author | Zdenek Kabelac <zkabelac@redhat.com> | 2021-12-10 20:51:46 +0100 |
---|---|---|
committer | Zdenek Kabelac <zkabelac@redhat.com> | 2021-12-20 16:13:28 +0100 |
commit | 26e6580dfb00912823282f7028ab542501c449ef (patch) | |
tree | 591a45bbd49e717666b82f15725f6f6596fbd2f0 /lib | |
parent | 09a4b56895b959f46a9b7e7af11732d8e1bbf945 (diff) | |
download | lvm2-26e6580dfb00912823282f7028ab542501c449ef.tar.gz |
toolcontext: reuse destroy_config_context
Call existing destroy_config_context() to destroy
some parts of cmd_context.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/commands/toolcontext.c | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/lib/commands/toolcontext.c b/lib/commands/toolcontext.c index a0c78ddd6..c772dc6b1 100644 --- a/lib/commands/toolcontext.c +++ b/lib/commands/toolcontext.c @@ -2041,8 +2041,6 @@ void destroy_toolcontext(struct cmd_context *cmd) _destroy_segtypes(&cmd->segtypes); _destroy_formats(cmd, &cmd->formats); _destroy_filters(cmd); - if (cmd->mem) - dm_pool_destroy(cmd->mem); devices_file_exit(cmd); dev_cache_exit(); _destroy_dev_types(cmd); @@ -2050,16 +2048,10 @@ void destroy_toolcontext(struct cmd_context *cmd) if ((cft_cmdline = remove_config_tree_by_source(cmd, CONFIG_STRING))) config_destroy(cft_cmdline); - _destroy_config(cmd); if (cmd->cft_def_hash) dm_hash_destroy(cmd->cft_def_hash); - if (cmd->libmem) - dm_pool_destroy(cmd->libmem); - - if (cmd->pending_delete_mem) - dm_pool_destroy(cmd->pending_delete_mem); #ifndef VALGRIND_POOL if (cmd->linebuffer) { /* Reset stream buffering to defaults */ @@ -2084,7 +2076,7 @@ void destroy_toolcontext(struct cmd_context *cmd) free(cmd->linebuffer); } #endif - free(cmd); + destroy_config_context(cmd); lvmpolld_disconnect(); |