shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2024-12-22 17:35:59 +03:00
Code Releases Activity

Allow dynamic extension of array of areas selected as allocation candidates.

Browse Source
This commit is contained in:
Alasdair Kergon 2010-03-23 15:07:55 +00:00
parent 2e08dbcb65
commit 36f9d53b60
2 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
WHATS_NEW
View File

@ -1,5 +1,6 @@
Version 2.02.63 - Version 2.02.63 -
================================ ================================
Allow dynamic extension of array of areas selected as allocation candidates.
Export and use only valid cookie value in test suite. Export and use only valid cookie value in test suite.
Remove const modifier for struct volume_group* from process_each_lv_in_vg(). Remove const modifier for struct volume_group* from process_each_lv_in_vg().
Don't allow resizing of internal logical volumes. Don't allow resizing of internal logical volumes.

31
lib/metadata/lv_manip.c
View File

@ -989,8 +989,8 @@ static int _check_contiguous(struct cmd_context *cmd,
* Choose sets of parallel areas to use, respecting any constraints. * Choose sets of parallel areas to use, respecting any constraints.
*/ */
static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc, static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
struct dm_list *pvms, struct pv_area **areas, struct dm_list *pvms, struct pv_area ***areas_ptr,
uint32_t areas_size, unsigned can_split, uint32_t *areas_size_ptr, unsigned can_split,
struct lv_segment *prev_lvseg, struct lv_segment *prev_lvseg,
uint32_t *allocated, uint32_t needed) uint32_t *allocated, uint32_t needed)
{ {
@ -1094,8 +1094,8 @@ static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
if (prev_lvseg && if (prev_lvseg &&
_check_contiguous(ah->cmd, _check_contiguous(ah->cmd,
prev_lvseg, prev_lvseg,
pva, areas, pva, *areas_ptr,
areas_size)) { *areas_size_ptr)) {
preferred_count++; preferred_count++;
goto next_pv; goto next_pv;
} }
@ -1106,8 +1106,8 @@ static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
if (prev_lvseg && if (prev_lvseg &&
_check_cling(ah->cmd, _check_cling(ah->cmd,
prev_lvseg, prev_lvseg,
pva, areas, pva, *areas_ptr,
areas_size)) { *areas_size_ptr)) {
preferred_count++; preferred_count++;
} }
goto next_pv; goto next_pv;
@ -1127,10 +1127,15 @@ static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
already_found_one = 1; already_found_one = 1;
} }
areas[ix + ix_offset - 1] = pva; /* Expand areas array if needed after an area was split. */
if (ix + ix_offset > *areas_size_ptr) {
*areas_size_ptr *= 2;
*areas_ptr = dm_realloc(*areas_ptr, sizeof(**areas_ptr) * (*areas_size_ptr));
}
(*areas_ptr)[ix + ix_offset - 1] = pva;
} }
next_pv: next_pv:
if (ix >= areas_size) if (ix >= *areas_size_ptr)
break; break;
} }
@ -1146,7 +1151,7 @@ static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
/* sort the areas so we allocate from the biggest */ /* sort the areas so we allocate from the biggest */
if (ix > 1) if (ix > 1)
qsort(areas + ix_offset, ix, sizeof(*areas), qsort((*areas_ptr) + ix_offset, ix, sizeof(**areas_ptr),
_comp_area); _comp_area);
/* /*
@ -1160,7 +1165,7 @@ static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
if (log_needs_allocating) { if (log_needs_allocating) {
/* How many areas are too small for the log? */ /* How many areas are too small for the log? */
while (too_small_for_log_count < ix_offset + ix && while (too_small_for_log_count < ix_offset + ix &&
(*(areas + ix_offset + ix - 1 - (*((*areas_ptr) + ix_offset + ix - 1 -
too_small_for_log_count))->count < ah->log_len) too_small_for_log_count))->count < ah->log_len)
too_small_for_log_count++; too_small_for_log_count++;
ix_log_offset = ix_offset + ix - too_small_for_log_count - ah->log_area_count; ix_log_offset = ix_offset + ix - too_small_for_log_count - ah->log_area_count;
@ -1172,7 +1177,7 @@ static int _find_parallel_space(struct alloc_handle *ah, alloc_policy_t alloc,
/* FIXME With ALLOC_ANYWHERE, need to split areas */ /* FIXME With ALLOC_ANYWHERE, need to split areas */
break; break;
if (!_alloc_parallel_area(ah, max_parallel, areas, allocated, if (!_alloc_parallel_area(ah, max_parallel, *areas_ptr, allocated,
log_needs_allocating, ix_log_offset)) log_needs_allocating, ix_log_offset))
return_0; return_0;
@ -1247,8 +1252,8 @@ static int _allocate(struct alloc_handle *ah,
/* Attempt each defined allocation policy in turn */ /* Attempt each defined allocation policy in turn */
for (alloc = ALLOC_CONTIGUOUS; alloc < ALLOC_INHERIT; alloc++) { for (alloc = ALLOC_CONTIGUOUS; alloc < ALLOC_INHERIT; alloc++) {
old_allocated = allocated; old_allocated = allocated;
if (!_find_parallel_space(ah, alloc, pvms, areas, if (!_find_parallel_space(ah, alloc, pvms, &areas,
areas_size, can_split, &areas_size, can_split,
prev_lvseg, &allocated, ah->new_extents)) prev_lvseg, &allocated, ah->new_extents))
goto_out; goto_out;
if ((allocated == ah->new_extents) || (ah->alloc == alloc) || if ((allocated == ah->new_extents) || (ah->alloc == alloc) ||