shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

liblvm: check extents_from_size

Browse Source 
Since the function may fail, check for error.
(in release fix)
This commit is contained in:
Zdenek Kabelac 2013-07-19 15:35:04 +02:00
parent d4ad728610
commit 90bdbcc201
1 changed files with 22 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
liblvm/lvm_lv.c
View File

@ -368,7 +368,7 @@ lv_t lvm_lv_snapshot(const lv_t lv, const char *snap_name,
} }
/* Set defaults for thin pool specific LV parameters */ /* Set defaults for thin pool specific LV parameters */
static void _lv_set_pool_params(struct lvcreate_params *lp, static int _lv_set_pool_params(struct lvcreate_params *lp,
vg_t vg, const char *pool, vg_t vg, const char *pool,
uint64_t extents, uint64_t meta_size) uint64_t extents, uint64_t meta_size)
{ {
@ -396,9 +396,12 @@ static void _lv_set_pool_params(struct lvcreate_params *lp,
lp->poolmetadatasize += lp->poolmetadatasize +=
vg->extent_size - lp->poolmetadatasize % vg->extent_size; vg->extent_size - lp->poolmetadatasize % vg->extent_size;
lp->poolmetadataextents = if (!(lp->poolmetadataextents =
extents_from_size(vg->cmd, lp->poolmetadatasize / SECTOR_SIZE, extents_from_size(vg->cmd, lp->poolmetadatasize / SECTOR_SIZE,
vg->extent_size); vg->extent_size)))
return_0;
return 1;
} }
lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg, lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg,
@ -453,7 +456,8 @@ lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg,
return NULL; return NULL;
} }
_lv_set_pool_params(&lvcp->lvp, vg, pool_name, extents, meta_size); if (!_lv_set_pool_params(&lvcp->lvp, vg, pool_name, extents, meta_size))
return_NULL;
lvcp->magic = LV_CREATE_PARAMS_MAGIC; lvcp->magic = LV_CREATE_PARAMS_MAGIC;
} }
@ -461,7 +465,7 @@ lv_create_params_t lvm_lv_params_create_thin_pool(vg_t vg,
} }
/* Set defaults for thin LV specific parameters */ /* Set defaults for thin LV specific parameters */
static void _lv_set_thin_params(struct lvcreate_params *lp, static int _lv_set_thin_params(struct lvcreate_params *lp,
vg_t vg, const char *pool, vg_t vg, const char *pool,
const char *lvname, const char *lvname,
uint64_t extents) uint64_t extents)
@ -473,15 +477,18 @@ static void _lv_set_thin_params(struct lvcreate_params *lp,
lp->segtype = get_segtype_from_string(vg->cmd, "thin"); lp->segtype = get_segtype_from_string(vg->cmd, "thin");
lp->voriginsize = extents * vg->extent_size; lp->voriginsize = extents * vg->extent_size;
lp->voriginextents = extents_from_size(vg->cmd, lp->voriginsize, if (!(lp->voriginextents = extents_from_size(vg->cmd, lp->voriginsize,
vg->extent_size); vg->extent_size)))
return_0;
lp->stripes = 1; lp->stripes = 1;
return 1;
} }
lv_create_params_t lvm_lv_params_create_snapshot(const lv_t lv, lv_create_params_t lvm_lv_params_create_snapshot(const lv_t lv,
const char *snap_name, const char *snap_name,
uint64_t max_snap_size) uint64_t max_snap_size)
{ {
uint64_t size = 0; uint64_t size = 0;
uint64_t extents = 0; uint64_t extents = 0;
@ -501,7 +508,8 @@ lv_create_params_t lvm_lv_params_create_snapshot(const lv_t lv,
if (max_snap_size) { if (max_snap_size) {
size = max_snap_size >> SECTOR_SHIFT; size = max_snap_size >> SECTOR_SHIFT;
extents = extents_from_size(lv->vg->cmd, size, lv->vg->extent_size); if (!(extents = extents_from_size(lv->vg->cmd, size, lv->vg->extent_size)))
return_NULL;
} }
if (!size && !lv_is_thin_volume(lv) ) { if (!size && !lv_is_thin_volume(lv) ) {
@ -572,7 +580,9 @@ lv_create_params_t lvm_lv_params_create_thin(const vg_t vg, const char *pool_nam
lvcp = dm_pool_zalloc(vg->vgmem, sizeof (struct lvm_lv_create_params)); lvcp = dm_pool_zalloc(vg->vgmem, sizeof (struct lvm_lv_create_params));
if (lvcp) { if (lvcp) {
lvcp->vg = vg; lvcp->vg = vg;
_lv_set_thin_params(&lvcp->lvp, vg, pool_name, lvname, extents); if (!_lv_set_thin_params(&lvcp->lvp, vg, pool_name, lvname, extents))
return_NULL;
lvcp->magic = LV_CREATE_PARAMS_MAGIC; lvcp->magic = LV_CREATE_PARAMS_MAGIC;
} }