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/tools vgmerge.c Date: Wed, 02 Sep 2009 21:28:00 -0000 [thread overview] Message-ID: <20090902212827.13267.qmail@sourceware.org> (raw) CVSROOT: /cvs/lvm2 Module name: LVM2 Changes by: wysochanski@sourceware.org 2009-09-02 21:28:27 Modified files: tools : vgmerge.c Log message: Refactor vgmerge - combine _vgmerge_to and _vgmerge_from into _vgmerge_vg_read. These functions are identical so should be no functional change. Author: Dave Wysochanski <dwysocha@redhat.com> Patches: http://sourceware.org/cgi-bin/cvsweb.cgi/LVM2/tools/vgmerge.c.diff?cvsroot=lvm2&r1=1.62&r2=1.63 --- LVM2/tools/vgmerge.c 2009/09/02 21:28:10 1.62 +++ LVM2/tools/vgmerge.c 2009/09/02 21:28:27 1.63 @@ -15,31 +15,17 @@ #include "tools.h" -static struct volume_group *_vgmerge_from(struct cmd_context *cmd, - const char *vg_name_from) +static struct volume_group *_vgmerge_vg_read(struct cmd_context *cmd, + const char *vg_name) { - struct volume_group *vg_from; - log_verbose("Checking for volume group \"%s\"", vg_name_from); - vg_from = vg_read_for_update(cmd, vg_name_from, NULL, 0); - if (vg_read_error(vg_from)) { - vg_release(vg_from); + struct volume_group *vg; + log_verbose("Checking for volume group \"%s\"", vg_name); + vg = vg_read_for_update(cmd, vg_name, NULL, 0); + if (vg_read_error(vg)) { + vg_release(vg); return NULL; } - return vg_from; -} - -static struct volume_group *_vgmerge_to(struct cmd_context *cmd, - const char *vg_name_to) -{ - struct volume_group *vg_to; - - log_verbose("Checking for volume group \"%s\"", vg_name_to); - vg_to = vg_read_for_update(cmd, vg_name_to, NULL, 0); - if (vg_read_error(vg_to)) { - vg_release(vg_to); - return NULL; - } - return vg_to; + return vg; } static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, @@ -55,11 +41,11 @@ return ECMD_FAILED; } - vg_to = _vgmerge_to(cmd, vg_name_to); + vg_to = _vgmerge_vg_read(cmd, vg_name_to); if (!vg_to) return ECMD_FAILED; - vg_from = _vgmerge_from(cmd, vg_name_from); + vg_from = _vgmerge_vg_read(cmd, vg_name_from); if (!vg_from) { unlock_and_release_vg(cmd, vg_to, vg_name_to); return ECMD_FAILED;
next reply other threads:[~2009-09-02 21:28 UTC|newest] Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top 2009-09-02 21:28 wysochanski [this message] -- strict thread matches above, loose matches on Subject: below -- 2010-06-28 20:39 wysochanski 2009-09-02 21:28 wysochanski 2009-09-02 21:28 wysochanski 2009-09-02 21:27 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=20090902212827.13267.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).