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

Properly release VG memory pool in archiver code.

Browse Source
This commit is contained in:
Milan Broz 2009-04-10 10:00:37 +00:00
parent 095bbca691
commit fc310448c0
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/format_text/archive.c
View File

@ -326,7 +326,7 @@ static void _display_archive(struct cmd_context *cmd, struct archive_file *af)
log_print("Description:\t%s", desc ? : "<No description>");
log_print("Backup Time:\t%s", ctime(&when));
dm_pool_free(cmd->mem, vg);
vg_release(vg);
tf->fmt->ops->destroy_instance(tf);
}

13
lib/format_text/archiver.c
View File

@ -326,6 +326,7 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
const char *file)
{
struct volume_group *vg;
int r = 0;
/*
* Read in the volume group from the text file.
@ -336,10 +337,11 @@ int backup_restore_from_file(struct cmd_context *cmd, const char *vg_name,
/*
* If PV is missing, there is already message from read above
*/
if (vg_missing_pv_count(vg))
return_0;
if (!vg_missing_pv_count(vg))
r = backup_restore_vg(cmd, vg);
return backup_restore_vg(cmd, vg);
vg_release(vg);
return r;
}
int backup_restore(struct cmd_context *cmd, const char *vg_name)
@ -414,12 +416,15 @@ void check_current_backup(struct volume_group *vg)
(vg->seqno == vg_backup->seqno) &&
(id_equal(&vg->id, &vg_backup->id))) {
log_suppress(old_suppress);
vg_release(vg_backup);
return;
}
log_suppress(old_suppress);
if (vg_backup)
if (vg_backup) {
archive(vg_backup);
vg_release(vg_backup);
}
archive(vg);
backup(vg);
}