shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-10 16:58:47 +03:00
Code Releases Activity

polldaemon: move lvconvert_get_copy_vg code

Browse Source 
Moving lvconvert_get_copy_vg to polldaemon (poll_get_copy_vg).
Clear move and rename.
This commit is contained in:
Ondrej Kozina 2015-05-04 14:32:32 +02:00
parent 7a5a4f952e
commit 079895b8be
5 changed files with 21 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/lvconvert.c
View File

@ -700,21 +700,21 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
}
static struct poll_functions _lvconvert_mirror_fns = {
.get_copy_vg = lvconvert_get_copy_vg,
.get_copy_vg = poll_get_copy_vg,
.get_copy_lv = lvconvert_get_copy_lv,
.poll_progress = poll_mirror_progress,
.finish_copy = lvconvert_mirror_finish,
};
static struct poll_functions _lvconvert_merge_fns = {
.get_copy_vg = lvconvert_get_copy_vg,
.get_copy_vg = poll_get_copy_vg,
.get_copy_lv = lvconvert_get_copy_lv,
.poll_progress = poll_merge_progress,
.finish_copy = lvconvert_merge_finish,
};
static struct poll_functions _lvconvert_thin_merge_fns = {
.get_copy_vg = lvconvert_get_copy_vg,
.get_copy_vg = poll_get_copy_vg,
.get_copy_lv = lvconvert_get_copy_lv,
.poll_progress = poll_thin_merge_progress,
.finish_copy = lvconvert_merge_finish,
@ -3219,7 +3219,7 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context
struct volume_group *vg;
struct logical_volume* lv = NULL;
vg = lvconvert_get_copy_vg(cmd, vg_name, NULL);
vg = poll_get_copy_vg(cmd, vg_name, NULL);
if (vg_read_error(vg)) {
release_vg(vg);
return_NULL;

14
tools/lvconvert_poll.c
View File

@ -16,20 +16,6 @@
#include "lvconvert_poll.h"
#include "tools.h"
struct volume_group *lvconvert_get_copy_vg(struct cmd_context *cmd,
const char *name,
const char *uuid __attribute__((unused)))
{
dev_close_all();
if (name && !strchr(name, '/'))
return vg_read_for_update(cmd, name, NULL, 0);
/* 'name' is the full LV name; must extract_vgname() */
return vg_read_for_update(cmd, extract_vgname(cmd, name),
NULL, 0);
}
struct logical_volume *lvconvert_get_copy_lv(struct cmd_context *cmd __attribute__((unused)),
struct volume_group *vg,
const char *name,

4
tools/lvconvert_poll.h
View File

@ -21,10 +21,6 @@ struct cmd_context;
struct logical_volume;
struct volume_group;
struct volume_group *lvconvert_get_copy_vg(struct cmd_context *cmd,
const char *name,
const char *uuid __attribute__((unused)));
struct logical_volume *lvconvert_get_copy_lv(struct cmd_context *cmd __attribute__((unused)),
struct volume_group *vg,
const char *name,

13
tools/polldaemon.c
View File

@ -49,6 +49,19 @@ progress_t poll_mirror_progress(struct cmd_context *cmd,
return PROGRESS_FINISHED_SEGMENT;
}
struct volume_group *poll_get_copy_vg(struct cmd_context *cmd,
const char *name,
const char *uuid __attribute__((unused)))
{
dev_close_all();
if (name && !strchr(name, '/'))
return vg_read_for_update(cmd, name, NULL, 0);
/* 'name' is the full LV name; must extract_vgname() */
return vg_read_for_update(cmd, extract_vgname(cmd, name), NULL, 0);
}
static int _check_lv_status(struct cmd_context *cmd,
struct volume_group *vg,
struct logical_volume *lv,

5
tools/polldaemon.h
View File

@ -1,6 +1,6 @@
/*
* Copyright (C) 2003-2004 Sistina Software, Inc. All rights reserved.
* Copyright (C) 2004 Red Hat, Inc. All rights reserved.
* Copyright (C) 2004-2015 Red Hat, Inc. All rights reserved.
*
* This file is part of LVM2.
*
@ -72,4 +72,7 @@ progress_t poll_mirror_progress(struct cmd_context *cmd,
struct logical_volume *lv, const char *name,
struct daemon_parms *parms);
struct volume_group *poll_get_copy_vg(struct cmd_context *cmd, const char *name,
const char *uuid);
#endif