shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

scan: add some missing frees

Browse Source 
some objects had been moved out of mem pools.
This commit is contained in:
David Teigland 2018-05-14 13:38:16 -05:00
parent 0e56fa6892
commit 517d6cc418
2 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/cache/lvmcache.c vendored
View File

@ -1001,6 +1001,7 @@ static void _filter_duplicate_devs(struct cmd_context *cmd)
if (MAJOR(info->dev->dev) == dt->md_major) {
log_debug_devs("Ignoring md component duplicate %s", dev_name(devl->dev));
dm_list_del(&devl->list);
dm_free(devl);
}
}
}
@ -1307,7 +1308,7 @@ next:
int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const char *vgid)
{
struct dm_list devs;
struct device_list *devl;
struct device_list *devl, *devl2;
struct lvmcache_vginfo *vginfo;
struct lvmcache_info *info, *info2;
@ -1338,6 +1339,7 @@ int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const
dm_list_add(&devs, &devl->list);
}
/* Deleting the last info will delete vginfo. */
dm_list_iterate_items_safe(info, info2, &vginfo->infos)
lvmcache_del(info);
@ -1350,6 +1352,11 @@ int lvmcache_label_rescan_vg(struct cmd_context *cmd, const char *vgname, const
label_scan_devs(cmd, cmd->filter, &devs);
dm_list_iterate_items_safe(devl, devl2, &devs) {
dm_list_del(&devl->list);
dm_free(devl);
}
if (!(vginfo = lvmcache_vginfo_from_vgname(vgname, vgid))) {
log_warn("VG info not found after rescan of %s", vgname);
return 0;
@ -1749,6 +1756,7 @@ void lvmcache_del(struct lvmcache_info *info)
info->label->labeller->ops->destroy_label(info->label->labeller,
info->label);
label_destroy(info->label);
dm_free(info);
}

9
lib/label/label.c
View File

@ -666,7 +666,7 @@ int label_scan(struct cmd_context *cmd)
{
struct dm_list all_devs;
struct dev_iter *iter;
struct device_list *devl;
struct device_list *devl, *devl2;
struct device *dev;
log_debug_devs("Finding devices to scan");
@ -718,6 +718,11 @@ int label_scan(struct cmd_context *cmd)
_scan_list(cmd, cmd->full_filter, &all_devs, NULL);
dm_list_iterate_items_safe(devl, devl2, &all_devs) {
dm_list_del(&devl->list);
dm_free(devl);
}
return 1;
}
@ -867,6 +872,8 @@ int label_read(struct device *dev)
_scan_list(NULL, NULL, &one_dev, &failed);
dm_free(devl);
if (failed)
return 0;
return 1;