public inbox for lvm2-cvs@sourceware.org
help / color / mirror / Atom feed
* LVM2/lib cache/lvmcache.c format_text/archive. ...
@ 2011-02-21 12:07 prajnoha
0 siblings, 0 replies; 2+ messages in thread
From: prajnoha @ 2011-02-21 12:07 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha@sourceware.org 2011-02-21 12:07:03
Modified files:
lib/cache : lvmcache.c
lib/format_text: archive.c archiver.c format-text.c
lib/metadata : metadata.c
Log message:
Change the code throughout for recent changes in format_instance handling.
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/cache/lvmcache.c.diff?cvsroot=lvm2&r1=1.103&r2=1.104
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/archive.c.diff?cvsroot=lvm2&r1=1.40&r2=1.41
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/archiver.c.diff?cvsroot=lvm2&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/format-text.c.diff?cvsroot=lvm2&r1=1.156&r2=1.157
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.425&r2=1.426
--- LVM2/lib/cache/lvmcache.c 2011/02/18 14:16:11 1.103
+++ LVM2/lib/cache/lvmcache.c 2011/02/21 12:07:03 1.104
@@ -629,6 +629,7 @@
struct lvmcache_vginfo *vginfo;
struct volume_group *vg;
struct format_instance *fid;
+ struct format_instance_ctx fic;
if (!vgid || !(vginfo = vginfo_from_vgid(vgid)) || !vginfo->vgmetadata)
return NULL;
@@ -652,9 +653,10 @@
(!precommitted && vginfo->precommitted && !critical_section()))
return NULL;
- if (!(fid = vginfo->fmt->ops->create_instance(vginfo->fmt,
- vginfo->vgname,
- vgid, NULL)))
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS;
+ fic.context.vg_ref.vg_name = vginfo->vgname;
+ fic.context.vg_ref.vg_id = vgid;
+ if (!(fid = vginfo->fmt->ops->create_instance(vginfo->fmt, &fic)))
return_NULL;
/* Build config tree from vgmetadata, if not yet cached */
--- LVM2/lib/format_text/archive.c 2010/12/08 20:50:49 1.40
+++ LVM2/lib/format_text/archive.c 2011/02/21 12:07:03 1.41
@@ -300,16 +300,16 @@
{
struct volume_group *vg = NULL;
struct format_instance *tf;
+ struct format_instance_ctx fic;
time_t when;
char *desc;
- void *context;
log_print(" ");
log_print("File:\t\t%s", af->path);
- if (!(context = create_text_context(cmd, af->path, NULL)) ||
- !(tf = cmd->fmt_backup->ops->create_instance(cmd->fmt_backup, NULL,
- NULL, context))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_PRIVATE_MDAS;
+ if (!(fic.context.private = create_text_context(cmd, af->path, NULL)) ||
+ !(tf = cmd->fmt_backup->ops->create_instance(cmd->fmt_backup, &fic))) {
log_error("Couldn't create text instance object.");
return;
}
--- LVM2/lib/format_text/archiver.c 2011/01/28 10:16:04 1.38
+++ LVM2/lib/format_text/archiver.c 2011/02/21 12:07:03 1.39
@@ -270,13 +270,12 @@
{
struct volume_group *vg = NULL;
struct format_instance *tf;
+ struct format_instance_ctx fic;
struct metadata_area *mda;
- void *context;
- if (!(context = create_text_context(cmd, file,
- cmd->cmd_line)) ||
- !(tf = cmd->fmt_backup->ops->create_instance(cmd->fmt_backup, NULL,
- NULL, context))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_PRIVATE_MDAS;
+ if (!(fic.context.private = create_text_context(cmd, file, cmd->cmd_line)) ||
+ !(tf = cmd->fmt_backup->ops->create_instance(cmd->fmt_backup, &fic))) {
log_error("Couldn't create text format object.");
return NULL;
}
@@ -297,6 +296,8 @@
struct pv_list *pvl;
struct physical_volume *pv;
struct lvmcache_info *info;
+ struct format_instance *fid;
+ struct format_instance_ctx fic;
/*
* FIXME: Check that the PVs referenced in the backup are
@@ -304,8 +305,10 @@
*/
/* Attempt to write out using currently active format */
- if (!(vg->fid = cmd->fmt->ops->create_instance(cmd->fmt, vg->name,
- NULL, NULL))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS;
+ fic.context.vg_ref.vg_name = vg->name;
+ fic.context.vg_ref.vg_id = NULL;
+ if (!(vg->fid = cmd->fmt->ops->create_instance(cmd->fmt, &fic))) {
log_error("Failed to allocate format instance");
return 0;
}
@@ -386,17 +389,17 @@
{
int r = 0;
struct format_instance *tf;
+ struct format_instance_ctx fic;
struct metadata_area *mda;
- void *context;
struct cmd_context *cmd;
cmd = vg->cmd;
log_verbose("Creating volume group backup \"%s\" (seqno %u).", file, vg->seqno);
- if (!(context = create_text_context(cmd, file, desc)) ||
- !(tf = cmd->fmt_backup->ops->create_instance(cmd->fmt_backup, NULL,
- NULL, context))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_PRIVATE_MDAS;
+ if (!(fic.context.private = create_text_context(cmd, file, desc)) ||
+ !(tf = cmd->fmt_backup->ops->create_instance(cmd->fmt_backup, &fic))) {
log_error("Couldn't create backup object.");
return 0;
}
--- LVM2/lib/format_text/format-text.c 2011/02/21 12:05:50 1.156
+++ LVM2/lib/format_text/format-text.c 2011/02/21 12:07:03 1.157
@@ -1056,6 +1056,7 @@
DIR *d;
struct volume_group *vg;
struct format_instance *fid;
+ struct format_instance_ctx fic;
char path[PATH_MAX];
char *scanned_vgname;
@@ -1086,8 +1087,10 @@
}
/* FIXME stat file to see if it's changed */
- fid = _text_create_text_instance(fmt, NULL, NULL,
- NULL);
+ /* FIXME: Check this fid is OK! */
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_PRIVATE_MDAS;
+ fic.context.private = NULL;
+ fid = _text_create_text_instance(fmt, &fic);
if ((vg = _vg_read_file_name(fid, scanned_vgname,
path))) {
/* FIXME Store creation host in vg */
--- LVM2/lib/metadata/metadata.c 2011/02/21 12:05:50 1.425
+++ LVM2/lib/metadata/metadata.c 2011/02/21 12:07:03 1.426
@@ -906,6 +906,7 @@
struct volume_group *vg_create(struct cmd_context *cmd, const char *vg_name)
{
struct volume_group *vg;
+ struct format_instance_ctx fic;
int consistent = 0;
struct dm_pool *mem;
uint32_t rc;
@@ -979,8 +980,10 @@
/* initialize removed_pvs list */
dm_list_init(&vg->removed_pvs);
- if (!(vg->fid = cmd->fmt->ops->create_instance(cmd->fmt, vg_name,
- NULL, NULL))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS;
+ fic.context.vg_ref.vg_name = vg_name;
+ fic.context.vg_ref.vg_id = NULL;
+ if (!(vg->fid = cmd->fmt->ops->create_instance(cmd->fmt, &fic))) {
log_error("Failed to create format instance");
goto bad;
}
@@ -2604,6 +2607,7 @@
int warnings,
const char *orphan_vgname)
{
+ struct format_instance_ctx fic;
struct lvmcache_vginfo *vginfo;
struct lvmcache_info *info;
struct pv_list *pvl;
@@ -2635,9 +2639,10 @@
}
/* create format instance with appropriate metadata area */
- if (!(vg->fid = vginfo->fmt->ops->create_instance(vginfo->fmt,
- orphan_vgname, NULL,
- NULL))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_AUX_MDAS;
+ fic.context.vg_ref.vg_name = orphan_vgname;
+ fic.context.vg_ref.vg_id = NULL;
+ if (!(vg->fid = vginfo->fmt->ops->create_instance(vginfo->fmt, &fic))) {
log_error("Failed to create format instance");
goto bad;
}
@@ -2742,6 +2747,7 @@
int *consistent, unsigned precommitted)
{
struct format_instance *fid;
+ struct format_instance_ctx fic;
const struct format_type *fmt;
struct volume_group *vg, *correct_vg = NULL;
struct metadata_area *mda;
@@ -2814,7 +2820,10 @@
use_precommitted = 0;
/* create format instance with appropriate metadata area */
- if (!(fid = fmt->ops->create_instance(fmt, vgname, vgid, NULL))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS;
+ fic.context.vg_ref.vg_name = vgname;
+ fic.context.vg_ref.vg_id = vgid;
+ if (!(fid = fmt->ops->create_instance(fmt, &fic))) {
log_error("Failed to create format instance");
return NULL;
}
@@ -2969,7 +2978,10 @@
use_precommitted = 0;
/* create format instance with appropriate metadata area */
- if (!(fid = fmt->ops->create_instance(fmt, vgname, vgid, NULL))) {
+ fic.type = FMT_INSTANCE_VG | FMT_INSTANCE_MDAS | FMT_INSTANCE_AUX_MDAS;
+ fic.context.vg_ref.vg_name = vgname;
+ fic.context.vg_ref.vg_id = vgid;
+ if (!(fid = fmt->ops->create_instance(fmt, &fic))) {
log_error("Failed to create format instance");
return NULL;
}
^ permalink raw reply [flat|nested] 2+ messages in thread
* LVM2/lib cache/lvmcache.c format_text/archive. ...
@ 2011-03-11 15:08 prajnoha
0 siblings, 0 replies; 2+ messages in thread
From: prajnoha @ 2011-03-11 15:08 UTC (permalink / raw)
To: lvm-devel, lvm2-cvs
CVSROOT: /cvs/lvm2
Module name: LVM2
Changes by: prajnoha@sourceware.org 2011-03-11 15:08:32
Modified files:
lib/cache : lvmcache.c
lib/format_text: archive.c archiver.c
lib/metadata : metadata.c
Log message:
Various cleanups for fid mem and ref_count changes.
Missing free_vg on error_path in lvmcache_get_vg fn. Call destroy_instance
only if the fid is not part of the vg in backup_read_vg fn (otherwise it's
part of the VG we're returning and we definitely don't want to destroy it!).
Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/cache/lvmcache.c.diff?cvsroot=lvm2&r1=1.105&r2=1.106
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/archive.c.diff?cvsroot=lvm2&r1=1.42&r2=1.43
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_text/archiver.c.diff?cvsroot=lvm2&r1=1.45&r2=1.46
http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.446&r2=1.447
--- LVM2/lib/cache/lvmcache.c 2011/03/10 03:03:04 1.105
+++ LVM2/lib/cache/lvmcache.c 2011/03/11 15:08:31 1.106
@@ -627,7 +627,7 @@
struct volume_group *lvmcache_get_vg(const char *vgid, unsigned precommitted)
{
struct lvmcache_vginfo *vginfo;
- struct volume_group *vg;
+ struct volume_group *vg = NULL;
struct format_instance *fid;
struct format_instance_ctx fic;
@@ -663,20 +663,21 @@
if (!vginfo->cft &&
!(vginfo->cft =
create_config_tree_from_string(fid->fmt->cmd,
- vginfo->vgmetadata))) {
- _free_cached_vgmetadata(vginfo);
- return_NULL;
- }
+ vginfo->vgmetadata)))
+ goto_bad;
- if (!(vg = import_vg_from_config_tree(vginfo->cft, fid))) {
- _free_cached_vgmetadata(vginfo);
- return_NULL;
- }
+ if (!(vg = import_vg_from_config_tree(vginfo->cft, fid)))
+ goto_bad;
log_debug("Using cached %smetadata for VG %s.",
vginfo->precommitted ? "pre-committed" : "", vginfo->vgname);
return vg;
+
+bad:
+ free_vg(vg);
+ _free_cached_vgmetadata(vginfo);
+ return NULL;
}
struct dm_list *lvmcache_get_vgids(struct cmd_context *cmd,
--- LVM2/lib/format_text/archive.c 2011/03/11 14:45:18 1.42
+++ LVM2/lib/format_text/archive.c 2011/03/11 15:08:32 1.43
@@ -333,7 +333,6 @@
log_print("Backup Time:\t%s", ctime(&when));
free_vg(vg);
- tf->fmt->ops->destroy_instance(tf);
}
int archive_list(struct cmd_context *cmd, const char *dir, const char *vgname)
--- LVM2/lib/format_text/archiver.c 2011/03/11 14:45:18 1.45
+++ LVM2/lib/format_text/archiver.c 2011/03/11 15:08:32 1.46
@@ -289,7 +289,9 @@
break;
}
- tf->fmt->ops->destroy_instance(tf);
+ if (!vg)
+ tf->fmt->ops->destroy_instance(tf);
+
return vg;
}
@@ -401,6 +403,7 @@
if (!dm_list_size(&tf->metadata_areas_in_use)) {
log_error(INTERNAL_ERROR "No in use metadata areas to write.");
+ tf->fmt->ops->destroy_instance(tf);
return 0;
}
--- LVM2/lib/metadata/metadata.c 2011/03/11 15:06:13 1.446
+++ LVM2/lib/metadata/metadata.c 2011/03/11 15:08:32 1.447
@@ -2647,7 +2647,7 @@
struct lvmcache_vginfo *vginfo;
struct lvmcache_info *info;
struct pv_list *pvl;
- struct volume_group *vg;
+ struct volume_group *vg = NULL;
struct physical_volume *pv = NULL;
lvmcache_label_scan(cmd, 0);
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-03-11 15:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-02-21 12:07 LVM2/lib cache/lvmcache.c format_text/archive. prajnoha
2011-03-11 15:08 prajnoha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).