shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-21 13:34:40 +03:00
Code Releases Activity

polldaemon: move lvconvert_get_copy_lv code

Browse Source 
Moving lvconvert_get_copy_lv to polldaemon (poll_get_copy_lv).
Clear move and rename.
This commit is contained in:
Ondrej Kozina 2015-04-10 13:57:13 +02:00
parent 079895b8be
commit 26f4b1da88
5 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tools/lvconvert.c
View File

@ -701,21 +701,21 @@ static int _read_params(struct cmd_context *cmd, int argc, char **argv,
static struct poll_functions _lvconvert_mirror_fns = { static struct poll_functions _lvconvert_mirror_fns = {
.get_copy_vg = poll_get_copy_vg, .get_copy_vg = poll_get_copy_vg,
.get_copy_lv = lvconvert_get_copy_lv, .get_copy_lv = poll_get_copy_lv,
.poll_progress = poll_mirror_progress, .poll_progress = poll_mirror_progress,
.finish_copy = lvconvert_mirror_finish, .finish_copy = lvconvert_mirror_finish,
}; };
static struct poll_functions _lvconvert_merge_fns = { static struct poll_functions _lvconvert_merge_fns = {
.get_copy_vg = poll_get_copy_vg, .get_copy_vg = poll_get_copy_vg,
.get_copy_lv = lvconvert_get_copy_lv, .get_copy_lv = poll_get_copy_lv,
.poll_progress = poll_merge_progress, .poll_progress = poll_merge_progress,
.finish_copy = lvconvert_merge_finish, .finish_copy = lvconvert_merge_finish,
}; };
static struct poll_functions _lvconvert_thin_merge_fns = { static struct poll_functions _lvconvert_thin_merge_fns = {
.get_copy_vg = poll_get_copy_vg, .get_copy_vg = poll_get_copy_vg,
.get_copy_lv = lvconvert_get_copy_lv, .get_copy_lv = poll_get_copy_lv,
.poll_progress = poll_thin_merge_progress, .poll_progress = poll_thin_merge_progress,
.finish_copy = lvconvert_merge_finish, .finish_copy = lvconvert_merge_finish,
}; };
@ -3225,7 +3225,7 @@ static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context
return_NULL; return_NULL;
} }
if (!(lv = lvconvert_get_copy_lv(cmd, vg, lv_name, NULL, 0))) { if (!(lv = poll_get_copy_lv(cmd, vg, lv_name, NULL, 0))) {
log_error("Can't find LV %s in VG %s", lv_name, vg_name); log_error("Can't find LV %s in VG %s", lv_name, vg_name);
unlock_and_release_vg(cmd, vg, vg_name); unlock_and_release_vg(cmd, vg, vg_name);
return NULL; return NULL;

14
tools/lvconvert_poll.c
View File

@ -16,20 +16,6 @@
#include "lvconvert_poll.h" #include "lvconvert_poll.h"
#include "tools.h" #include "tools.h"
struct logical_volume *lvconvert_get_copy_lv(struct cmd_context *cmd __attribute__((unused)),
struct volume_group *vg,
const char *name,
const char *uuid,
uint64_t lv_type __attribute__((unused)))
{
struct logical_volume *lv = find_lv(vg, name);
if (!lv || (uuid && strcmp(uuid, (char *)&lv->lvid)))
return NULL;
return lv;
}
int lvconvert_mirror_finish(struct cmd_context *cmd, int lvconvert_mirror_finish(struct cmd_context *cmd,
struct volume_group *vg, struct volume_group *vg,
struct logical_volume *lv, struct logical_volume *lv,

6
tools/lvconvert_poll.h
View File

@ -21,12 +21,6 @@ struct cmd_context;
struct logical_volume; struct logical_volume;
struct volume_group; struct volume_group;
struct logical_volume *lvconvert_get_copy_lv(struct cmd_context *cmd __attribute__((unused)),
struct volume_group *vg,
const char *name,
const char *uuid,
uint64_t lv_type __attribute__((unused)));
int lvconvert_mirror_finish(struct cmd_context *cmd, int lvconvert_mirror_finish(struct cmd_context *cmd,
struct volume_group *vg, struct volume_group *vg,
struct logical_volume *lv, struct logical_volume *lv,

14
tools/polldaemon.c
View File

@ -62,6 +62,20 @@ struct volume_group *poll_get_copy_vg(struct cmd_context *cmd,
return vg_read_for_update(cmd, extract_vgname(cmd, name), NULL, 0); return vg_read_for_update(cmd, extract_vgname(cmd, name), NULL, 0);
} }
struct logical_volume *poll_get_copy_lv(struct cmd_context *cmd __attribute__((unused)),
struct volume_group *vg,
const char *name,
const char *uuid,
uint64_t lv_type __attribute__((unused)))
{
struct logical_volume *lv = find_lv(vg, name);
if (!lv || (uuid && strcmp(uuid, (char *)&lv->lvid)))
return NULL;
return lv;
}
static int _check_lv_status(struct cmd_context *cmd, static int _check_lv_status(struct cmd_context *cmd,
struct volume_group *vg, struct volume_group *vg,
struct logical_volume *lv, struct logical_volume *lv,

5
tools/polldaemon.h
View File

@ -75,4 +75,9 @@ progress_t poll_mirror_progress(struct cmd_context *cmd,
struct volume_group *poll_get_copy_vg(struct cmd_context *cmd, const char *name, struct volume_group *poll_get_copy_vg(struct cmd_context *cmd, const char *name,
const char *uuid); const char *uuid);
struct logical_volume *poll_get_copy_lv(struct cmd_context *cmd,
struct volume_group *vg,
const char *name, const char *uuid,
uint64_t lv_type);
#endif #endif