diff options
| author | Joe Thornber <ejt@redhat.com> | 2018-06-08 14:21:07 +0100 |
|---|---|---|
| committer | Joe Thornber <ejt@redhat.com> | 2018-06-08 14:21:07 +0100 |
| commit | 7c4b19c335c7da9f2b58ef71de46b170b59a2f9d (patch) | |
| tree | 849c2db47e6539e9ec4f306ff55da7781baf6b54 /lib/thin | |
| parent | 0e2a358da926b75dabd5074fcff589cac0f22821 (diff) | |
| parent | 0ac89fb8603d891458cbb55d9071db0c5c057db3 (diff) | |
| download | lvm2-7c4b19c335c7da9f2b58ef71de46b170b59a2f9d.tar.gz | |
Merge branch '2018-06-04-data-structs'
Diffstat (limited to 'lib/thin')
| -rw-r--r-- | lib/thin/thin.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/thin/thin.c b/lib/thin/thin.c index 3c62008fd..d759b76e4 100644 --- a/lib/thin/thin.c +++ b/lib/thin/thin.c @@ -12,6 +12,7 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ +#include "base/memory/zalloc.h" #include "lib/misc/lib.h" #include "lib/display/display.h" #include "lib/metadata/metadata.h" @@ -745,8 +746,8 @@ static int _thin_target_present(struct cmd_context *cmd, static void _thin_destroy(struct segment_type *segtype) { - dm_free((void *) segtype->dso); - dm_free(segtype); + free((void *) segtype->dso); + free(segtype); } static struct segtype_handler _thin_pool_ops = { @@ -803,7 +804,7 @@ int init_multiple_segtypes(struct cmd_context *cmd, struct segtype_library *segl unsigned i; for (i = 0; i < DM_ARRAY_SIZE(reg_segtypes); ++i) { - segtype = dm_zalloc(sizeof(*segtype)); + segtype = zalloc(sizeof(*segtype)); if (!segtype) { log_error("Failed to allocate memory for %s segtype", |