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/metadata/metadata-exported.h lib/meta ... Date: Tue, 14 Jul 2009 02:15:00 -0000 [thread overview] Message-ID: <20090714021523.5936.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2009-07-14 02:15:21 Modified files: lib/metadata : metadata-exported.h metadata.c tools : vgsplit.c Log message: Refactor vgsplit - move move_pvs_used_by_lv and move_pv inside library. In the future we may export these functions or something like them in liblvm For now this helps in cleaning up the checks for RESIZEABLE since we can use the internal library function vg_bad_status_bits. Signed-off-by: Dave Wysochanski <dwysocha@redhat.com> Acked-by: Alasdair G Kergon <agk@redhat.com> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata-exported.h.diff?cvsroot=lvm2&r1=1.90&r2=1.91 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/lib/metadata/metadata.c.diff?cvsroot=lvm2&r1=1.247&r2=1.248 http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgsplit.c.diff?cvsroot=lvm2&r1=1.83&r2=1.84 --- LVM2/lib/metadata/metadata-exported.h 2009/07/10 21:19:37 1.90 +++ LVM2/lib/metadata/metadata-exported.h 2009/07/14 02:15:21 1.91 @@ -375,6 +375,11 @@ int pv_write(struct cmd_context *cmd, struct physical_volume *pv, struct dm_list *mdas, int64_t label_sector); int is_pv(pv_t *pv); +int move_pv(struct volume_group *vg_from, struct volume_group *vg_to, + const char *pv_name); +int move_pvs_used_by_lv(struct volume_group *vg_from, + struct volume_group *vg_to, + const char *lv_name); int is_orphan_vg(const char *vg_name); int is_orphan(const pv_t *pv); int vgs_are_compatible(struct cmd_context *cmd, --- LVM2/lib/metadata/metadata.c 2009/07/14 02:14:04 1.247 +++ LVM2/lib/metadata/metadata.c 2009/07/14 02:15:21 1.248 @@ -274,6 +274,72 @@ return r; } +int move_pv(struct volume_group *vg_from, struct volume_group *vg_to, + const char *pv_name) +{ + struct physical_volume *pv; + struct pv_list *pvl; + + /* FIXME: handle tags */ + if (!(pvl = find_pv_in_vg(vg_from, pv_name))) { + log_error("Physical volume %s not in volume group %s", + pv_name, vg_from->name); + return 0; + } + + dm_list_move(&vg_to->pvs, &pvl->list); + + vg_from->pv_count--; + vg_to->pv_count++; + + pv = pvl->pv; + + vg_from->extent_count -= pv_pe_count(pv); + vg_to->extent_count += pv_pe_count(pv); + + vg_from->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv); + vg_to->free_count += pv_pe_count(pv) - pv_pe_alloc_count(pv); + + return 1; +} + +int move_pvs_used_by_lv(struct volume_group *vg_from, + struct volume_group *vg_to, + const char *lv_name) +{ + struct lv_segment *lvseg; + unsigned s; + struct lv_list *lvl; + struct logical_volume *lv; + + /* FIXME: handle tags */ + if (!(lvl = find_lv_in_vg(vg_from, lv_name))) { + log_error("Logical volume %s not in volume group %s", + lv_name, vg_from->name); + return 0; + } + + dm_list_iterate_items(lvseg, &lvl->lv->segments) { + if (lvseg->log_lv) + if (!move_pvs_used_by_lv(vg_from, vg_to, + lvseg->log_lv->name)) + return_0; + for (s = 0; s < lvseg->area_count; s++) { + if (seg_type(lvseg, s) == AREA_PV) { + if (!move_pv(vg_from, vg_to, + pv_dev_name(seg_pv(lvseg, s)))) + return_0; + } else if (seg_type(lvseg, s) == AREA_LV) { + lv = seg_lv(lvseg, s); + if (!move_pvs_used_by_lv(vg_from, vg_to, + lv->name)) + return_0; + } + } + } + return 1; +} + static int validate_new_vg_name(struct cmd_context *cmd, const char *vg_name) { char vg_path[PATH_MAX]; --- LVM2/tools/vgsplit.c 2009/07/09 10:09:33 1.83 +++ LVM2/tools/vgsplit.c 2009/07/14 02:15:21 1.84 @@ -15,72 +15,6 @@ #include "tools.h" -static int _move_pv(struct volume_group *vg_from, struct volume_group *vg_to, - const char *pv_name) -{ - struct physical_volume *pv; - struct pv_list *pvl; - - /* FIXME: handle tags */ - if (!(pvl = find_pv_in_vg(vg_from, pv_name))) { - log_error("Physical volume %s not in volume group %s", - pv_name, vg_from->name); - return 0; - } - - dm_list_move(&vg_to->pvs, &pvl->list); - - vg_from->pv_count--; - vg_to->pv_count++; - - pv = pvl->pv; - - vg_from->extent_count -= pv_pe_count(pv); - vg_to->extent_count += pv_pe_count(pv); - - vg_from->free_count -= pv_pe_count(pv) - pv_pe_alloc_count(pv); - vg_to->free_count += pv_pe_count(pv) - pv_pe_alloc_count(pv); - - return 1; -} - -static int _move_pvs_used_by_lv(struct volume_group *vg_from, - struct volume_group *vg_to, - const char *lv_name) -{ - struct lv_segment *lvseg; - unsigned s; - struct lv_list *lvl; - struct logical_volume *lv; - - /* FIXME: handle tags */ - if (!(lvl = find_lv_in_vg(vg_from, lv_name))) { - log_error("Logical volume %s not in volume group %s", - lv_name, vg_from->name); - return 0; - } - - dm_list_iterate_items(lvseg, &lvl->lv->segments) { - if (lvseg->log_lv) - if (!_move_pvs_used_by_lv(vg_from, vg_to, - lvseg->log_lv->name)) - return_0; - for (s = 0; s < lvseg->area_count; s++) { - if (seg_type(lvseg, s) == AREA_PV) { - if (!_move_pv(vg_from, vg_to, - pv_dev_name(seg_pv(lvseg, s)))) - return_0; - } else if (seg_type(lvseg, s) == AREA_LV) { - lv = seg_lv(lvseg, s); - if (!_move_pvs_used_by_lv(vg_from, vg_to, - lv->name)) - return_0; - } - } - } - return 1; -} - /* FIXME Why not (lv->vg == vg) ? */ static int _lv_is_in_vg(struct volume_group *vg, struct logical_volume *lv) { @@ -401,12 +335,12 @@ /* Move PVs across to new structure */ for (opt = 0; opt < argc; opt++) { - if (!_move_pv(vg_from, vg_to, argv[opt])) + if (!move_pv(vg_from, vg_to, argv[opt])) goto_bad; } /* If an LV given on the cmdline, move used_by PVs */ - if (lv_name && !_move_pvs_used_by_lv(vg_from, vg_to, lv_name)) + if (lv_name && !move_pvs_used_by_lv(vg_from, vg_to, lv_name)) goto_bad; /* Move required LVs across, checking consistency */
next reply other threads:[~2009-07-14 2:15 UTC|newest] Thread overview: 41+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-07-14 2:15 wysochanski [this message] -- strict thread matches above, loose matches on Subject: below -- 2011-02-21 12:29 prajnoha 2010-10-12 16:41 mornfall 2010-06-30 20:03 agk 2010-06-30 18:03 wysochanski 2010-06-29 21:32 wysochanski 2010-06-28 20:40 wysochanski 2010-02-24 18:15 wysochanski 2010-02-24 18:15 wysochanski 2010-02-14 3:21 wysochanski 2010-02-14 3:21 wysochanski 2009-11-01 20:05 wysochanski 2009-11-01 19:51 wysochanski 2009-10-31 17:30 wysochanski 2009-10-05 20:03 wysochanski 2009-10-05 20:02 wysochanski 2009-10-01 1:04 agk 2009-09-14 15:45 wysochanski 2009-09-02 21:39 wysochanski 2009-09-02 21:39 wysochanski 2009-07-28 15:14 wysochanski 2009-07-28 13:17 wysochanski 2009-07-26 2:34 wysochanski 2009-07-26 1:53 wysochanski 2009-07-15 5:50 mornfall 2009-07-10 20:07 wysochanski 2009-07-10 20:05 wysochanski 2009-07-09 10:09 wysochanski 2009-07-09 10:08 wysochanski 2009-07-09 10:07 wysochanski 2009-07-09 10:06 wysochanski 2009-07-09 10:04 wysochanski 2009-07-09 10:03 wysochanski 2009-07-08 14:33 wysochanski 2009-07-01 17:01 wysochanski 2008-06-24 20:10 wysochanski 2008-01-16 19:54 wysochanski 2008-01-15 22:56 wysochanski 2007-12-22 2:13 agk 2007-11-15 22:11 agk 2007-07-23 21:03 wysochanski
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=20090714021523.5936.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).