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

Split lv_segment_area from lv_segment to permit extension.

Browse Source
This commit is contained in:
Alasdair Kergon 2005-10-18 13:43:40 +00:00
parent a38bf76bab
commit 06820362bd
4 changed files with 59 additions and 27 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.00 - Version 2.02.00 -
=================================== ===================================
Split lv_segment_area from lv_segment to permit extension.
Replacement deactivation code using libdevmapper dependency tree. Replacement deactivation code using libdevmapper dependency tree.
Simplify dev_manager_info(). Simplify dev_manager_info().
Attempt to load missing targets using modprobe. Attempt to load missing targets using modprobe.

37
lib/metadata/lv_manip.c
View File

@ -67,9 +67,15 @@ struct lv_segment *alloc_lv_segment(struct dm_pool *mem,
uint32_t extents_copied) uint32_t extents_copied)
{ {
struct lv_segment *seg; struct lv_segment *seg;
uint32_t sz = sizeof(*seg) + (area_count * sizeof(seg->area[0])); uint32_t areas_sz = area_count * sizeof(*seg->areas);
if (!(seg = dm_pool_zalloc(mem, sz))) { if (!(seg = dm_pool_zalloc(mem, sizeof(*seg)))) {
stack;
return NULL;
}
if (!(seg->areas = dm_pool_zalloc(mem, areas_sz))) {
dm_pool_free(mem, seg);
stack; stack;
return NULL; return NULL;
} }
@ -199,7 +205,7 @@ int move_lv_segment_area(struct lv_segment *seg_to, uint32_t area_to,
int set_lv_segment_area_pv(struct lv_segment *seg, uint32_t area_num, int set_lv_segment_area_pv(struct lv_segment *seg, uint32_t area_num,
struct physical_volume *pv, uint32_t pe) struct physical_volume *pv, uint32_t pe)
{ {
seg->area[area_num].type = AREA_PV; seg->areas[area_num].type = AREA_PV;
if (!(seg_pvseg(seg, area_num) = if (!(seg_pvseg(seg, area_num) =
assign_peg_to_lvseg(pv, pe, seg->area_len, seg, area_num))) { assign_peg_to_lvseg(pv, pe, seg->area_len, seg, area_num))) {
@ -217,12 +223,35 @@ void set_lv_segment_area_lv(struct lv_segment *seg, uint32_t area_num,
struct logical_volume *lv, uint32_t le, struct logical_volume *lv, uint32_t le,
uint32_t flags) uint32_t flags)
{ {
seg->area[area_num].type = AREA_LV; seg->areas[area_num].type = AREA_LV;
seg_lv(seg, area_num) = lv; seg_lv(seg, area_num) = lv;
seg_le(seg, area_num) = le; seg_le(seg, area_num) = le;
lv->status |= flags; lv->status |= flags;
} }
/*
* Prepare for adding parallel areas to an existing segment.
*/
static int _lv_segment_add_areas(struct logical_volume *lv,
struct lv_segment *seg,
uint32_t new_area_count)
{
struct lv_segment_area *newareas;
uint32_t areas_sz = new_area_count * sizeof(*newareas);
if (!(newareas = dm_pool_zalloc(lv->vg->cmd->mem, areas_sz))) {
stack;
return 0;
}
memcpy(newareas, seg->areas, seg->area_count * sizeof(*seg->areas));
seg->areas = newareas;
seg->area_count = new_area_count;
return 1;
}
/* /*
* Reduce the size of an lv_segment. New size can be zero. * Reduce the size of an lv_segment. New size can be zero.
*/ */

42
lib/metadata/metadata.h
View File

@ -214,6 +214,20 @@ struct volume_group {
struct list tags; struct list tags;
}; };
/* There will be one area for each stripe */
struct lv_segment_area {
area_type_t type;
union {
struct {
struct pv_segment *pvseg;
} pv;
struct {
struct logical_volume *lv;
uint32_t le;
} lv;
} u;
};
struct segment_type; struct segment_type;
struct lv_segment { struct lv_segment {
struct list list; struct list list;
@ -239,28 +253,16 @@ struct lv_segment {
struct list tags; struct list tags;
/* There will be one area for each stripe */ struct lv_segment_area *areas;
struct {
area_type_t type;
union {
struct {
struct pv_segment *pvseg;
} pv;
struct {
struct logical_volume *lv;
uint32_t le;
} lv;
} u;
} area[0];
}; };
#define seg_type(seg, s) (seg)->area[(s)].type #define seg_type(seg, s) (seg)->areas[(s)].type
#define seg_pvseg(seg, s) (seg)->area[(s)].u.pv.pvseg #define seg_pvseg(seg, s) (seg)->areas[(s)].u.pv.pvseg
#define seg_pv(seg, s) (seg)->area[(s)].u.pv.pvseg->pv #define seg_pv(seg, s) (seg)->areas[(s)].u.pv.pvseg->pv
#define seg_dev(seg, s) (seg)->area[(s)].u.pv.pvseg->pv->dev #define seg_dev(seg, s) (seg)->areas[(s)].u.pv.pvseg->pv->dev
#define seg_pe(seg, s) (seg)->area[(s)].u.pv.pvseg->pe #define seg_pe(seg, s) (seg)->areas[(s)].u.pv.pvseg->pe
#define seg_lv(seg, s) (seg)->area[(s)].u.lv.lv #define seg_lv(seg, s) (seg)->areas[(s)].u.lv.lv
#define seg_le(seg, s) (seg)->area[(s)].u.lv.le #define seg_le(seg, s) (seg)->areas[(s)].u.lv.le
struct logical_volume { struct logical_volume {
union lvid lvid; union lvid lvid;

6
lib/striped/striped.c
View File

@ -112,8 +112,8 @@ static int _segments_compatible(struct lv_segment *first,
/* FIXME Relax this to first area type != second area type */ /* FIXME Relax this to first area type != second area type */
/* plus the additional AREA_LV checks needed */ /* plus the additional AREA_LV checks needed */
if ((first->area[s].type != AREA_PV) || if ((first->areas[s].type != AREA_PV) ||
(second->area[s].type != AREA_PV)) (second->areas[s].type != AREA_PV))
return 0; return 0;
width = first->area_len; width = first->area_len;
@ -142,7 +142,7 @@ static int _merge_segments(struct lv_segment *seg1, struct lv_segment *seg2)
seg1->area_len += seg2->area_len; seg1->area_len += seg2->area_len;
for (s = 0; s < seg1->area_count; s++) for (s = 0; s < seg1->area_count; s++)
if (seg1->area[s].type == AREA_PV) if (seg1->areas[s].type == AREA_PV)
merge_pv_segments(seg_pvseg(seg1, s), merge_pv_segments(seg_pvseg(seg1, s),
seg_pvseg(seg2, s)); seg_pvseg(seg2, s));