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

lvm2app: update to new lv_create_single API

Browse Source 
lv_create_single is more type based.
This commit is contained in:
Zdenek Kabelac 2014-10-26 07:25:30 +01:00
parent 7916cae697
commit 618d818c0d
2 changed files with 16 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
liblvm/lvm_lv.c
View File

@ -221,7 +221,6 @@ static int _lv_set_default_linear_params(struct cmd_context *cmd,
}
lp->stripes = 1;
lp->stripe_size = DEFAULT_STRIPESIZE * 2;
return 1;
}
@ -499,9 +498,7 @@ static int _lv_set_pool_params(struct lvcreate_params *lp,
vg_t vg, const char *pool_name,
uint64_t extents, uint64_t meta_size)
{
_lv_set_default_params(lp, vg, NULL, extents);
lp->pool_name = pool_name;
_lv_set_default_params(lp, vg, pool_name, extents);
lp->create_pool = 1;
lp->segtype = get_segtype_from_string(vg->cmd, "thin-pool");
@ -625,8 +622,8 @@ static int _lv_set_thin_params(struct lvcreate_params *lp,
}
static lv_create_params_t _lvm_lv_params_create_snapshot(const lv_t lv,
const char *snap_name,
uint64_t max_snap_size)
const char *snap_name,
uint64_t max_snap_size)
{
uint64_t size = 0;
uint64_t extents = 0;
@ -652,24 +649,24 @@ static lv_create_params_t _lvm_lv_params_create_snapshot(const lv_t lv,
if (!size && !lv_is_thin_volume(lv) ) {
log_error("Origin is not thin, specify size of snapshot");
return NULL;
return NULL;
}
lvcp = dm_pool_zalloc(lv->vg->vgmem, sizeof (struct lvm_lv_create_params));
if (lvcp) {
lvcp->vg = lv->vg;
_lv_set_default_params(&lvcp->lvp, lv->vg, snap_name, extents);
lvcp->lvp.snapshot = 1;
if (size) {
lvcp->lvp.segtype = _get_segtype(lvcp->vg->cmd);
if (!(lvcp->lvp.segtype = get_segtype_from_string(lv->vg->cmd, "snapshot"))) {
log_error("Segtype snapshot not found.");
return NULL;
}
lvcp->lvp.chunk_size = 8;
lvcp->lvp.snapshot = 1;
} else {
lvcp->lvp.segtype = get_segtype_from_string(lv->vg->cmd, "thin");
if (!lvcp->lvp.segtype) {
log_error(INTERNAL_ERROR "Segtype thin not found.");
if (!(lvcp->lvp.segtype = get_segtype_from_string(lv->vg->cmd, "thin"))) {
log_error("Segtype thin not found.");
return NULL;
}

14
python/liblvm.c
View File

@ -611,7 +611,10 @@ static PyObject *_liblvm_lvm_vg_close(vgobject *self)
{
/* if already closed, don't reclose it */
if (self->vg) {
lvm_vg_close(self->vg);
if (lvm_vg_close(self->vg) == -1) {
PyErr_SetObject(_LibLVMError, _liblvm_get_last_error());
return NULL;
}
self->vg = NULL;
self->libh_copy = NULL;
}
@ -647,14 +650,7 @@ static PyObject *_liblvm_lvm_vg_remove(vgobject *self)
goto error;
/* Not much you can do with a vg that is removed so close it */
if (lvm_vg_close(self->vg) == -1)
goto error;
self->vg = NULL;
Py_INCREF(Py_None);
return Py_None;
return _liblvm_lvm_vg_close(self);
error:
PyErr_SetObject(_LibLVMError, _liblvm_get_last_error());