shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

Various code clean-ups (s/malloc/zalloc/, new msgs, etc)

Browse Source 
Fix a couple more issues that kabi found.
- Add some error messages in failure cases
- s/malloc/zalloc/
- use vg->vgmem for lv names instead of vg->cmd->mem
This commit is contained in:
Jonathan Earl Brassow 2011-08-11 21:32:18 +00:00
parent 5bedb7a5e0
commit a22515c87f
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/metadata/raid_manip.c
View File

@ -242,7 +242,7 @@ static int _extract_image_components(struct lv_segment *seg, uint32_t idx,
{
int len;
char *tmp_name;
struct cmd_context *cmd = seg->lv->vg->cmd;
struct volume_group *vg = seg->lv->vg;
struct logical_volume *data_lv = seg_lv(seg, idx);
struct logical_volume *meta_lv = seg_metalv(seg, idx);
@ -262,14 +262,14 @@ static int _extract_image_components(struct lv_segment *seg, uint32_t idx,
seg_metatype(seg, idx) = AREA_UNASSIGNED;
len = strlen(meta_lv->name) + strlen("_extracted") + 1;
tmp_name = dm_pool_alloc(cmd->mem, len);
tmp_name = dm_pool_alloc(vg->vgmem, len);
if (!tmp_name)
return_0;
sprintf(tmp_name, "%s_extracted", meta_lv->name);
meta_lv->name = tmp_name;
len = strlen(data_lv->name) + strlen("_extracted") + 1;
tmp_name = dm_pool_alloc(cmd->mem, len);
tmp_name = dm_pool_alloc(vg->vgmem, len);
if (!tmp_name)
return_0;
sprintf(tmp_name, "%s_extracted", data_lv->name);

8
lib/raid/raid.c
View File

@ -321,11 +321,13 @@ static struct segtype_handler _raid_ops = {
static struct segment_type *init_raid_segtype(struct cmd_context *cmd,
const char *raid_type)
{
struct segment_type *segtype = dm_malloc(sizeof(*segtype));
struct segment_type *segtype = dm_zalloc(sizeof(*segtype));
if (!segtype)
if (!segtype) {
log_error("Failed to allocate memory for %s segtype",
raid_type);
return_NULL;
}
segtype->cmd = cmd;
segtype->flags = SEG_RAID;