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

lvconvert.c: drop get_vg_lock_and_logical_volume fn

Browse Source
This commit is contained in:
David Teigland 2015-05-19 16:46:11 +02:00 committed by Ondrej Kozina
parent f400f9db19
commit cf5b4a2286
1 changed files with 33 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
tools/lvconvert.c
View File

@ -3231,37 +3231,6 @@ static int _lvconvert_single(struct cmd_context *cmd, struct logical_volume *lv,
return ECMD_PROCESSED; return ECMD_PROCESSED;
} }
/*
* FIXME move to toollib along with the rest of the drop/reacquire
* VG locking that is used by _lvconvert_merge_single()
*/
static struct logical_volume *get_vg_lock_and_logical_volume(struct cmd_context *cmd,
const char *vg_name,
const char *lv_name)
{
/*
* Returns NULL if the requested LV doesn't exist;
* otherwise the caller must release_vg(lv->vg)
* - it is also up to the caller to unlock_vg() as needed
*/
struct volume_group *vg;
struct logical_volume* lv = NULL;
vg = vg_read(cmd, vg_name, NULL, READ_FOR_UPDATE);
if (vg_read_error(vg)) {
release_vg(vg);
return_NULL;
}
if (!(lv = find_lv(vg, lv_name))) {
log_error("Can't find LV %s in VG %s", lv_name, vg_name);
unlock_and_release_vg(cmd, vg, vg_name);
return NULL;
}
return lv;
}
static int _poll_logical_volume(struct cmd_context *cmd, struct logical_volume *lv, static int _poll_logical_volume(struct cmd_context *cmd, struct logical_volume *lv,
int wait_completion) int wait_completion)
{ {
@ -3278,6 +3247,7 @@ static int _poll_logical_volume(struct cmd_context *cmd, struct logical_volume *
static int lvconvert_single(struct cmd_context *cmd, struct lvconvert_params *lp) static int lvconvert_single(struct cmd_context *cmd, struct lvconvert_params *lp)
{ {
struct logical_volume *lv; struct logical_volume *lv;
struct volume_group *vg;
int ret = ECMD_FAILED; int ret = ECMD_FAILED;
int saved_ignore_suspended_devices = ignore_suspended_devices(); int saved_ignore_suspended_devices = ignore_suspended_devices();
@ -3286,21 +3256,29 @@ static int lvconvert_single(struct cmd_context *cmd, struct lvconvert_params *lp
cmd->handles_missing_pvs = 1; cmd->handles_missing_pvs = 1;
} }
if (!(lv = get_vg_lock_and_logical_volume(cmd, lp->vg_name, lp->lv_name))) vg = vg_read(cmd, lp->vg_name, NULL, READ_FOR_UPDATE);
if (vg_read_error(vg)) {
release_vg(vg);
goto_out; goto_out;
}
if (!(lv = find_lv(vg, lp->lv_name))) {
log_error("Can't find LV %s in VG %s", lp->lv_name, lp->vg_name);
unlock_and_release_vg(cmd, vg, lp->vg_name);
goto_out;
}
/* /*
* lp->pvh holds the list of PVs available for allocation or removal * lp->pvh holds the list of PVs available for allocation or removal
*/ */
if (lp->pv_count) { if (lp->pv_count) {
if (!(lp->pvh = create_pv_list(cmd->mem, lv->vg, lp->pv_count, if (!(lp->pvh = create_pv_list(cmd->mem, vg, lp->pv_count, lp->pvs, 0)))
lp->pvs, 0)))
goto_bad; goto_bad;
} else } else
lp->pvh = &lv->vg->pvs; lp->pvh = &vg->pvs;
if (lp->replace_pv_count && if (lp->replace_pv_count &&
!(lp->replace_pvh = create_pv_list(cmd->mem, lv->vg, !(lp->replace_pvh = create_pv_list(cmd->mem, vg,
lp->replace_pv_count, lp->replace_pv_count,
lp->replace_pvs, 0))) lp->replace_pvs, 0)))
goto_bad; goto_bad;
@ -3314,7 +3292,7 @@ bad:
ret = _poll_logical_volume(cmd, lp->lv_to_poll, ret = _poll_logical_volume(cmd, lp->lv_to_poll,
lp->wait_completion); lp->wait_completion);
release_vg(lv->vg); release_vg(vg);
out: out:
init_ignore_suspended_devices(saved_ignore_suspended_devices); init_ignore_suspended_devices(saved_ignore_suspended_devices);
return ret; return ret;
@ -3325,8 +3303,9 @@ static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volum
{ {
struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle; struct lvconvert_params *lp = (struct lvconvert_params *) handle->custom_handle;
const char *vg_name; const char *vg_name;
struct logical_volume *refreshed_lv; struct volume_group *vg_fresh;
int ret; struct logical_volume *lv_fresh;
int ret = ECMD_FAILED;
/* /*
* FIXME can't trust lv's VG to be current given that caller * FIXME can't trust lv's VG to be current given that caller
@ -3335,16 +3314,23 @@ static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volum
* - preemptively drop the VG lock, as is needed for * - preemptively drop the VG lock, as is needed for
* _poll_logical_volume(), refresh LV (and VG in the process). * _poll_logical_volume(), refresh LV (and VG in the process).
*/ */
vg_name = lv->vg->name; vg_name = lv->vg->name;
unlock_vg(cmd, vg_name); unlock_vg(cmd, vg_name);
refreshed_lv = get_vg_lock_and_logical_volume(cmd, vg_name, lv->name); vg_fresh = vg_read(cmd, vg_name, NULL, READ_FOR_UPDATE);
if (!refreshed_lv) { if (vg_read_error(vg_fresh)) {
log_error("ABORTING: Can't reread LV %s/%s", vg_name, lv->name); log_error("ABORTING: Can't reread VG %s", vg_name);
return ECMD_FAILED; goto out;
} }
lp->lv_to_poll = refreshed_lv; if (!(lv_fresh = find_lv(vg_fresh, lv->name))) {
if ((ret = _lvconvert_single(cmd, refreshed_lv, lp)) != ECMD_PROCESSED) log_error("ABORTING: Can't find LV %s in VG %s", lv->name, vg_name);
unlock_vg(cmd, vg_name);
goto out;
}
lp->lv_to_poll = lv_fresh;
if ((ret = _lvconvert_single(cmd, lv_fresh, lp)) != ECMD_PROCESSED)
stack; stack;
if (ret == ECMD_PROCESSED && lp->need_polling) { if (ret == ECMD_PROCESSED && lp->need_polling) {
@ -3365,9 +3351,8 @@ static int _lvconvert_merge_single(struct cmd_context *cmd, struct logical_volum
ret = ECMD_FAILED; ret = ECMD_FAILED;
} }
} }
out:
release_vg(refreshed_lv->vg); release_vg(vg_fresh);
return ret; return ret;
} }