shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-03 05:18:29 +03:00
Code Releases Activity

Refactor vgmerge - combine _vgmerge_to and _vgmerge_from into _vgmerge_vg_read.

Browse Source 
These functions are identical so should be no functional change.


Author: Dave Wysochanski <dwysocha@redhat.com>
This commit is contained in:
Dave Wysochanski 2009-09-02 21:28:27 +00:00
parent af9ded781d
commit 7c86e3909c
1 changed files with 10 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
tools/vgmerge.c
View File

@ -15,31 +15,17 @@
#include "tools.h" #include "tools.h"
static struct volume_group *_vgmerge_from(struct cmd_context *cmd, static struct volume_group *_vgmerge_vg_read(struct cmd_context *cmd,
const char *vg_name_from) const char *vg_name)
{ {
struct volume_group *vg_from; struct volume_group *vg;
log_verbose("Checking for volume group \"%s\"", vg_name_from); log_verbose("Checking for volume group \"%s\"", vg_name);
vg_from = vg_read_for_update(cmd, vg_name_from, NULL, 0); vg = vg_read_for_update(cmd, vg_name, NULL, 0);
if (vg_read_error(vg_from)) { if (vg_read_error(vg)) {
vg_release(vg_from); vg_release(vg);
return NULL; return NULL;
} }
return vg_from; return vg;
}
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;
} }
static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to, static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
@ -55,11 +41,11 @@ static int _vgmerge_single(struct cmd_context *cmd, const char *vg_name_to,
return ECMD_FAILED; return ECMD_FAILED;
} }
vg_to = _vgmerge_to(cmd, vg_name_to); vg_to = _vgmerge_vg_read(cmd, vg_name_to);
if (!vg_to) if (!vg_to)
return ECMD_FAILED; return ECMD_FAILED;
vg_from = _vgmerge_from(cmd, vg_name_from); vg_from = _vgmerge_vg_read(cmd, vg_name_from);
if (!vg_from) { if (!vg_from) {
unlock_and_release_vg(cmd, vg_to, vg_name_to); unlock_and_release_vg(cmd, vg_to, vg_name_to);
return ECMD_FAILED; return ECMD_FAILED;