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

lv_manip: reuse function also during reduction

Browse Source 
Move function _setup_lv_size() in front of _lv_reduce() so
it can be reused also in this function.
Avoid propagating 0 length to upper layer.
This commit is contained in:
Zdenek Kabelac 2021-02-05 11:37:52 +01:00
parent bdc2f4c704
commit 39dec26508
1 changed files with 29 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
lib/metadata/lv_manip.c
View File

@ -1458,6 +1458,30 @@ static int _lv_segment_reduce(struct lv_segment *seg, uint32_t reduction)
return 1;
}
/* Handles also stacking */
static int _setup_lv_size(struct logical_volume *lv, uint32_t extents)
{
struct lv_segment *seg;
lv->le_count = extents;
lv->size = (uint64_t) extents * lv->vg->extent_size;
if (lv->size &&
(lv_is_thin_pool_data(lv) ||
lv_is_vdo_pool_data(lv))) {
if (!(seg = get_only_segment_using_this_lv(lv)))
return_0;
/* Update pool segment from the layered LV */
seg->lv->le_count =
seg->len =
seg->area_len = lv->le_count;
seg->lv->size = lv->size;
}
return 1;
}
/*
* Entry point for all LV reductions in size.
*/
@ -1549,18 +1573,15 @@ static int _lv_reduce(struct logical_volume *lv, uint32_t extents, int delete)
count -= reduction;
}
seg = first_seg(lv);
if (!_setup_lv_size(lv, lv->le_count - extents * (is_raid10 ? data_copies : 1)))
return_0;
if (is_raid10) {
lv->le_count -= extents * data_copies;
if (seg)
if ((seg = first_seg(lv))) {
if (is_raid10)
seg->len = seg->area_len = lv->le_count;
} else
lv->le_count -= extents;
lv->size = (uint64_t) lv->le_count * lv->vg->extent_size;
if (seg)
seg->extents_copied = seg->len;
}
if (!delete)
return 1;
@ -1969,29 +1990,6 @@ static void _init_alloc_parms(struct alloc_handle *ah,
alloc_parms->flags |= A_CAN_SPLIT;
}
/* Handles also stacking */
static int _setup_lv_size(struct logical_volume *lv, uint32_t extents)
{
struct lv_segment *pool_seg;
lv->le_count = extents;
lv->size = (uint64_t) extents * lv->vg->extent_size;
if (lv_is_thin_pool_data(lv) ||
lv_is_vdo_pool_data(lv)) {
if (!(pool_seg = get_only_segment_using_this_lv(lv)))
return_0;
/* Update pool segment from the layered LV */
pool_seg->lv->le_count =
pool_seg->len =
pool_seg->area_len = lv->le_count;
pool_seg->lv->size = lv->size;
}
return 1;
}
static int _setup_alloced_segment(struct logical_volume *lv, uint64_t status,
uint32_t area_count,
uint32_t stripe_size,