mirror of
git://sourceware.org/git/lvm2.git
synced 2024-10-03 17:50:03 +03:00
lvmlockd: retrive to retrieve
Replace retrive with retrieve for internal function.
This commit is contained in:
parent
625c55fd6c
commit
bfd5464002
@ -226,7 +226,7 @@ bad:
|
||||
#define _lockd_send(req_name, args...) \
|
||||
_lockd_send_with_pvs(req_name, NULL, ##args)
|
||||
|
||||
static int _lockd_retrive_vg_pv_num(struct volume_group *vg)
|
||||
static int _lockd_retrieve_vg_pv_num(struct volume_group *vg)
|
||||
{
|
||||
struct pv_list *pvl;
|
||||
int num = 0;
|
||||
@ -249,7 +249,7 @@ static void _lockd_free_pv_list(struct lvmlockd_pvs *lock_pvs)
|
||||
lock_pvs->num = 0;
|
||||
}
|
||||
|
||||
static void _lockd_retrive_vg_pv_list(struct volume_group *vg,
|
||||
static void _lockd_retrieve_vg_pv_list(struct volume_group *vg,
|
||||
struct lvmlockd_pvs *lock_pvs)
|
||||
{
|
||||
struct pv_list *pvl;
|
||||
@ -257,7 +257,7 @@ static void _lockd_retrive_vg_pv_list(struct volume_group *vg,
|
||||
|
||||
memset(lock_pvs, 0x0, sizeof(*lock_pvs));
|
||||
|
||||
pv_num = _lockd_retrive_vg_pv_num(vg);
|
||||
pv_num = _lockd_retrieve_vg_pv_num(vg);
|
||||
if (!pv_num) {
|
||||
log_error("Fail to any PVs for VG %s", vg->name);
|
||||
return;
|
||||
@ -286,7 +286,7 @@ static void _lockd_retrive_vg_pv_list(struct volume_group *vg,
|
||||
}
|
||||
}
|
||||
|
||||
static int _lockd_retrive_lv_pv_num(struct volume_group *vg,
|
||||
static int _lockd_retrieve_lv_pv_num(struct volume_group *vg,
|
||||
const char *lv_name)
|
||||
{
|
||||
struct logical_volume *lv = find_lv(vg, lv_name);
|
||||
@ -305,7 +305,7 @@ static int _lockd_retrive_lv_pv_num(struct volume_group *vg,
|
||||
return num;
|
||||
}
|
||||
|
||||
static void _lockd_retrive_lv_pv_list(struct volume_group *vg,
|
||||
static void _lockd_retrieve_lv_pv_list(struct volume_group *vg,
|
||||
const char *lv_name,
|
||||
struct lvmlockd_pvs *lock_pvs)
|
||||
{
|
||||
@ -319,7 +319,7 @@ static void _lockd_retrive_lv_pv_list(struct volume_group *vg,
|
||||
if (!lv)
|
||||
return;
|
||||
|
||||
pv_num = _lockd_retrive_lv_pv_num(vg, lv_name);
|
||||
pv_num = _lockd_retrieve_lv_pv_num(vg, lv_name);
|
||||
if (!pv_num) {
|
||||
/*
|
||||
* Fixup for 'lvcreate --type error -L1 -n $lv1 $vg', in this
|
||||
@ -330,7 +330,7 @@ static void _lockd_retrive_lv_pv_list(struct volume_group *vg,
|
||||
*/
|
||||
log_error("Fail to find any PVs for %s/%s, try to find PVs from VG instead",
|
||||
vg->name, lv_name);
|
||||
_lockd_retrive_vg_pv_list(vg, lock_pvs);
|
||||
_lockd_retrieve_vg_pv_list(vg, lock_pvs);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -1368,7 +1368,7 @@ int lockd_start_vg(struct cmd_context *cmd, struct volume_group *vg, int *exists
|
||||
* to send SCSI commands for idm locking scheme.
|
||||
*/
|
||||
if (!strcmp(vg->lock_type, "idm")) {
|
||||
_lockd_retrive_vg_pv_list(vg, &lock_pvs);
|
||||
_lockd_retrieve_vg_pv_list(vg, &lock_pvs);
|
||||
reply = _lockd_send_with_pvs("start_vg",
|
||||
&lock_pvs,
|
||||
"pid = " FMTd64, (int64_t) getpid(),
|
||||
@ -2579,7 +2579,7 @@ int lockd_lv_name(struct cmd_context *cmd, struct volume_group *vg,
|
||||
|
||||
/* Pass PV list for IDM lock type */
|
||||
if (!strcmp(vg->lock_type, "idm")) {
|
||||
_lockd_retrive_lv_pv_list(vg, lv_name, &lock_pvs);
|
||||
_lockd_retrieve_lv_pv_list(vg, lv_name, &lock_pvs);
|
||||
if (!_lockd_request(cmd, "lock_lv",
|
||||
vg->name, vg->lock_type, vg->lock_args,
|
||||
lv_name, lv_uuid, lock_args, mode, opts,
|
||||
|
Loading…
Reference in New Issue
Block a user