mirror of
git://sourceware.org/git/lvm2.git
synced 2024-12-21 13:34:40 +03:00
const: _fns poll_function
This commit is contained in:
parent
ff699eab24
commit
6430a6ca63
@ -59,12 +59,12 @@ struct daemon_parms {
|
|||||||
unsigned progress_display;
|
unsigned progress_display;
|
||||||
const char *progress_title;
|
const char *progress_title;
|
||||||
uint64_t lv_type;
|
uint64_t lv_type;
|
||||||
struct poll_functions *poll_fns;
|
const struct poll_functions *poll_fns;
|
||||||
char devicesfile[128];
|
char devicesfile[128];
|
||||||
};
|
};
|
||||||
|
|
||||||
int poll_daemon(struct cmd_context *cmd, unsigned background,
|
int poll_daemon(struct cmd_context *cmd, unsigned background,
|
||||||
uint64_t lv_type, struct poll_functions *poll_fns,
|
uint64_t lv_type, const struct poll_functions *poll_fns,
|
||||||
const char *progress_title, struct poll_operation_id *id);
|
const char *progress_title, struct poll_operation_id *id);
|
||||||
|
|
||||||
progress_t poll_mirror_progress(struct cmd_context *cmd,
|
progress_t poll_mirror_progress(struct cmd_context *cmd,
|
||||||
|
@ -277,17 +277,17 @@ static int _read_params(struct cmd_context *cmd, struct lvconvert_params *lp)
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
static struct poll_functions _lvconvert_mirror_fns = {
|
static const struct poll_functions _lvconvert_mirror_fns = {
|
||||||
.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 const struct poll_functions _lvconvert_merge_fns = {
|
||||||
.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 const struct poll_functions _lvconvert_thin_merge_fns = {
|
||||||
.poll_progress = poll_thin_merge_progress,
|
.poll_progress = poll_thin_merge_progress,
|
||||||
.finish_copy = lvconvert_merge_finish,
|
.finish_copy = lvconvert_merge_finish,
|
||||||
};
|
};
|
||||||
|
@ -19,23 +19,23 @@
|
|||||||
#include "lvconvert_poll.h"
|
#include "lvconvert_poll.h"
|
||||||
#include "daemons/lvmpolld/polling_ops.h"
|
#include "daemons/lvmpolld/polling_ops.h"
|
||||||
|
|
||||||
static struct poll_functions _pvmove_fns = {
|
static const struct poll_functions _pvmove_fns = {
|
||||||
.poll_progress = poll_mirror_progress,
|
.poll_progress = poll_mirror_progress,
|
||||||
.update_metadata = pvmove_update_metadata,
|
.update_metadata = pvmove_update_metadata,
|
||||||
.finish_copy = pvmove_finish
|
.finish_copy = pvmove_finish
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct poll_functions _convert_fns = {
|
static const struct poll_functions _convert_fns = {
|
||||||
.poll_progress = poll_mirror_progress,
|
.poll_progress = poll_mirror_progress,
|
||||||
.finish_copy = lvconvert_mirror_finish
|
.finish_copy = lvconvert_mirror_finish
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct poll_functions _merge_fns = {
|
static const struct poll_functions _merge_fns = {
|
||||||
.poll_progress = poll_merge_progress,
|
.poll_progress = poll_merge_progress,
|
||||||
.finish_copy = lvconvert_merge_finish
|
.finish_copy = lvconvert_merge_finish
|
||||||
};
|
};
|
||||||
|
|
||||||
static struct poll_functions _thin_merge_fns = {
|
static const struct poll_functions _thin_merge_fns = {
|
||||||
.poll_progress = poll_thin_merge_progress,
|
.poll_progress = poll_thin_merge_progress,
|
||||||
.finish_copy = lvconvert_merge_finish
|
.finish_copy = lvconvert_merge_finish
|
||||||
};
|
};
|
||||||
|
@ -648,7 +648,7 @@ static int _poll_daemon(struct cmd_context *cmd, struct poll_operation_id *id,
|
|||||||
}
|
}
|
||||||
|
|
||||||
static int _daemon_parms_init(struct cmd_context *cmd, struct daemon_parms *parms,
|
static int _daemon_parms_init(struct cmd_context *cmd, struct daemon_parms *parms,
|
||||||
unsigned background, struct poll_functions *poll_fns,
|
unsigned background, const struct poll_functions *poll_fns,
|
||||||
const char *progress_title, uint64_t lv_type)
|
const char *progress_title, uint64_t lv_type)
|
||||||
{
|
{
|
||||||
sign_t interval_sign;
|
sign_t interval_sign;
|
||||||
@ -687,7 +687,7 @@ static int _daemon_parms_init(struct cmd_context *cmd, struct daemon_parms *parm
|
|||||||
}
|
}
|
||||||
|
|
||||||
int poll_daemon(struct cmd_context *cmd, unsigned background,
|
int poll_daemon(struct cmd_context *cmd, unsigned background,
|
||||||
uint64_t lv_type, struct poll_functions *poll_fns,
|
uint64_t lv_type, const struct poll_functions *poll_fns,
|
||||||
const char *progress_title, struct poll_operation_id *id)
|
const char *progress_title, struct poll_operation_id *id)
|
||||||
{
|
{
|
||||||
struct daemon_parms parms;
|
struct daemon_parms parms;
|
||||||
|
@ -786,7 +786,7 @@ static int _pvmove_read_single(struct cmd_context *cmd,
|
|||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static struct poll_functions _pvmove_fns = {
|
static const struct poll_functions _pvmove_fns = {
|
||||||
.get_copy_name_from_lv = get_pvmove_pvname_from_lv_mirr,
|
.get_copy_name_from_lv = get_pvmove_pvname_from_lv_mirr,
|
||||||
.poll_progress = poll_mirror_progress,
|
.poll_progress = poll_mirror_progress,
|
||||||
.update_metadata = pvmove_update_metadata,
|
.update_metadata = pvmove_update_metadata,
|
||||||
|
Loading…
Reference in New Issue
Block a user