public inbox for lvm2-cvs@sourceware.org help / color / mirror / Atom feed
From: wysochanski@sourceware.org To: lvm-devel@redhat.com, lvm2-cvs@sourceware.org Subject: LVM2 lib/format_pool/import_export.c lib/metad ... Date: Tue, 13 Apr 2010 17:26:00 -0000 [thread overview] Message-ID: <20100413172604.11666.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2010-04-13 17:26:03 Modified files: lib/format_pool: import_export.c lib/metadata : metadata.c tools : lvconvert.c vgmerge.c vgreduce.c Log message: Call add_pvl_to_vgs() and del_pvl_from_vgs() from more places. Now that we have library functions to add/delete a pv from the vg->pvs list, call them from everywhere. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/format_pool/import_export.c.diff?cvsroot=lvm2&r1=1.31&r2=1.32 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.333&r2=1.334 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/lvconvert.c.diff?cvsroot=lvm2&r1=1.126&r2=1.127 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgmerge.c.diff?cvsroot=lvm2&r1=1.65&r2=1.66 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgreduce.c.diff?cvsroot=lvm2&r1=1.100&r2=1.101 --- LVM2/lib/format_pool/import_export.c 2010/04/13 17:25:26 1.31 +++ LVM2/lib/format_pool/import_export.c 2010/04/13 17:26:03 1.32 @@ -119,8 +119,7 @@ pl->pv = pvl->pv; pvl->mdas = NULL; pvl->pe_ranges = NULL; - vg->pv_count++; - dm_list_add(&vg->pvs, &pvl->list); + add_pvl_to_vgs(vg, pvl); } return 1; --- LVM2/lib/metadata/metadata.c 2010/04/13 17:25:44 1.333 +++ LVM2/lib/metadata/metadata.c 2010/04/13 17:26:03 1.334 @@ -347,10 +347,8 @@ _vg_bad_status_bits(vg_to, RESIZEABLE_VG)) return 0; - dm_list_move(&vg_to->pvs, &pvl->list); - - vg_from->pv_count--; - vg_to->pv_count++; + del_pvl_from_vgs(vg_from, pvl); + add_pvl_to_vgs(vg_to, pvl); pv = pvl->pv; @@ -517,7 +515,7 @@ return 0; dm_list_iterate_items_safe(pvl, tpvl, &vg->pvs) { - dm_list_del(&pvl->list); + del_pvl_from_vgs(vg, pvl); dm_list_add(&vg->removed_pvs, &pvl->list); } return 1; @@ -2510,8 +2508,7 @@ goto bad; } pvl->pv = pv; - dm_list_add(&vg->pvs, &pvl->list); - vg->pv_count++; + add_pvl_to_vgs(vg, pvl); } return vg; --- LVM2/tools/lvconvert.c 2010/04/13 01:54:34 1.126 +++ LVM2/tools/lvconvert.c 2010/04/13 17:26:03 1.127 @@ -751,8 +751,7 @@ /* FIXME: duplication of vgreduce code, move this to library */ vg->free_count -= pvl_vg->pv->pe_count; vg->extent_count -= pvl_vg->pv->pe_count; - vg->pv_count--; - dm_list_del(&pvl_vg->list); + del_pvl_from_vgs(vg, pvl_vg); removed++; } --- LVM2/tools/vgmerge.c 2009/09/14 22:47:50 1.65 +++ LVM2/tools/vgmerge.c 2010/04/13 17:26:03 1.66 @@ -31,6 +31,7 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, const char *vg_name_from) { + struct pv_list *pvl, *tpvl; struct volume_group *vg_to, *vg_from; struct lv_list *lvl1, *lvl2; int r = ECMD_FAILED; @@ -82,16 +83,11 @@ drop_cached_metadata(vg_from); /* Merge volume groups */ - while (!dm_list_empty(&vg_from->pvs)) { - struct dm_list *pvh = vg_from->pvs.n; - struct physical_volume *pv; - - dm_list_move(&vg_to->pvs, pvh); - - pv = dm_list_item(pvh, struct pv_list)->pv; - pv->vg_name = dm_pool_strdup(cmd->mem, vg_to->name); + dm_list_iterate_items_safe(pvl, tpvl, &vg_from->pvs) { + del_pvl_from_vgs(vg_from, pvl); + add_pvl_to_vgs(vg_to, pvl); + pvl->pv->vg_name = dm_pool_strdup(cmd->mem, vg_to->name); } - vg_to->pv_count += vg_from->pv_count; /* Fix up LVIDs */ dm_list_iterate_items(lvl1, &vg_to->lvs) { --- LVM2/tools/vgreduce.c 2010/03/16 14:37:39 1.100 +++ LVM2/tools/vgreduce.c 2010/04/13 17:26:03 1.101 @@ -39,9 +39,7 @@ vg->free_count -= pvl->pv->pe_count; vg->extent_count -= pvl->pv->pe_count; - vg->pv_count--; - - dm_list_del(&pvl->list); + del_pvl_from_vgs(vg, pvl); return 1; }
reply other threads:[~2010-04-13 17:26 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20100413172604.11666.qmail@sourceware.org \ --to=wysochanski@sourceware.org \ --cc=lvm-devel@redhat.com \ --cc=lvm2-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
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).