shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-08-31 09:49:29 +03:00
Code Releases Activity

style: Miscellaneous tidying up of metadata/lv*

Browse Source
This commit is contained in:
Heinz Mauelshagen
2015-09-23 14:37:52 +01:00
committed by Alasdair G Kergon
parent cb82919b0d
commit 192d9ad977
3 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/metadata/lv.c
View File

@ -648,6 +648,7 @@ int lv_raid_image_in_sync(const struct logical_volume *lv)
if ((seg = first_seg(lv))) if ((seg = first_seg(lv)))
raid_seg = get_only_segment_using_this_lv(seg->lv); raid_seg = get_only_segment_using_this_lv(seg->lv);
if (!raid_seg) { if (!raid_seg) {
log_error("Failed to find RAID segment for %s", lv->name); log_error("Failed to find RAID segment for %s", lv->name);
return 0; return 0;

4
lib/metadata/lv.h
View File

@ -35,8 +35,8 @@ struct logical_volume {
int32_t major; int32_t major;
int32_t minor; int32_t minor;
uint64_t size; /* Sectors */ uint64_t size; /* Sectors visible */
uint32_t le_count; uint32_t le_count; /* Logical extents visible */
uint32_t origin_count; uint32_t origin_count;
uint32_t external_count; uint32_t external_count;

42
lib/metadata/lv_manip.c
View File

@ -780,7 +780,7 @@ int get_default_region_size(struct cmd_context *cmd)
if (region_size & (region_size - 1)) { if (region_size & (region_size - 1)) {
region_size = _round_down_pow2(region_size); region_size = _round_down_pow2(region_size);
log_verbose("Reducing mirror region size to %u kiB (power of 2).", log_verbose("Reducing region size to %u kiB (power of 2).",
region_size / 2); region_size / 2);
} }
@ -938,7 +938,7 @@ dm_percent_t copy_percent(const struct logical_volume *lv)
numerator += seg->area_len; numerator += seg->area_len;
} }
return denominator ? dm_make_percent( numerator, denominator ) : 100.0; return denominator ? dm_make_percent(numerator, denominator) : 100.0;
} }
/* /*
@ -1037,6 +1037,7 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
uint32_t area_reduction, int with_discard) uint32_t area_reduction, int with_discard)
{ {
struct lv_segment *cache_seg; struct lv_segment *cache_seg;
struct logical_volume *lv = seg_lv(seg, s);
if (seg_type(seg, s) == AREA_UNASSIGNED) if (seg_type(seg, s) == AREA_UNASSIGNED)
return 1; return 1;
@ -1054,10 +1055,10 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
return 1; return 1;
} }
if (lv_is_mirror_image(seg_lv(seg, s)) || if (lv_is_mirror_image(lv) ||
lv_is_thin_pool_data(seg_lv(seg, s)) || lv_is_thin_pool_data(lv) ||
lv_is_cache_pool_data(seg_lv(seg, s))) { lv_is_cache_pool_data(lv)) {
if (!lv_reduce(seg_lv(seg, s), area_reduction)) if (!lv_reduce(lv, area_reduction))
return_0; /* FIXME: any upper level reporting */ return_0; /* FIXME: any upper level reporting */
return 1; return 1;
} }
@ -1071,20 +1072,20 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
return_0; return_0;
} }
if (lv_is_raid_image(seg_lv(seg, s))) { if (lv_is_raid_image(lv)) {
/* /*
* FIXME: Use lv_reduce not lv_remove * FIXME: Use lv_reduce not lv_remove
* We use lv_remove for now, because I haven't figured out * We use lv_remove for now, because I haven't figured out
* why lv_reduce won't remove the LV. * why lv_reduce won't remove the LV.
lv_reduce(seg_lv(seg, s), area_reduction); lv_reduce(lv, area_reduction);
*/ */
if (area_reduction != seg->area_len) { if (area_reduction != seg->area_len) {
log_error("Unable to reduce RAID LV - operation not implemented."); log_error("Unable to reduce RAID LV - operation not implemented.");
return_0; return_0;
} else { } else {
if (!lv_remove(seg_lv(seg, s))) { if (!lv_remove(lv)) {
log_error("Failed to remove RAID image %s", log_error("Failed to remove RAID image %s",
seg_lv(seg, s)->name); lv->name);
return 0; return 0;
} }
} }
@ -1105,9 +1106,9 @@ static int _release_and_discard_lv_segment_area(struct lv_segment *seg, uint32_t
log_very_verbose("Remove %s:%" PRIu32 "[%" PRIu32 "] from " log_very_verbose("Remove %s:%" PRIu32 "[%" PRIu32 "] from "
"the top of LV %s:%" PRIu32, "the top of LV %s:%" PRIu32,
seg->lv->name, seg->le, s, seg->lv->name, seg->le, s,
seg_lv(seg, s)->name, seg_le(seg, s)); lv->name, seg_le(seg, s));
if (!remove_seg_from_segs_using_this_lv(seg_lv(seg, s), seg)) if (!remove_seg_from_segs_using_this_lv(lv, seg))
return_0; return_0;
seg_lv(seg, s) = NULL; seg_lv(seg, s) = NULL;
seg_le(seg, s) = 0; seg_le(seg, s) = 0;
@ -1519,6 +1520,7 @@ static uint32_t _calc_area_multiple(const struct segment_type *segtype,
*/ */
if (area_count <= segtype->parity_devs) if (area_count <= segtype->parity_devs)
return 1; return 1;
return area_count - segtype->parity_devs; return area_count - segtype->parity_devs;
} }
@ -1744,7 +1746,7 @@ static int _setup_alloced_segment(struct logical_volume *lv, uint64_t status,
extents = aa[0].len * area_multiple; extents = aa[0].len * area_multiple;
lv->le_count += extents; lv->le_count += extents;
lv->size += (uint64_t) extents *lv->vg->extent_size; lv->size += (uint64_t) extents * lv->vg->extent_size;
return 1; return 1;
} }
@ -1910,7 +1912,7 @@ static int _for_each_pv(struct cmd_context *cmd, struct logical_volume *lv,
*max_seg_len = remaining_seg_len; *max_seg_len = remaining_seg_len;
area_multiple = _calc_area_multiple(seg->segtype, seg->area_count, 0); area_multiple = _calc_area_multiple(seg->segtype, seg->area_count, 0);
area_len = remaining_seg_len / area_multiple ? : 1; area_len = remaining_seg_len / (area_multiple ? : 1);
/* For striped mirrors, all the areas are counted, through the mirror layer */ /* For striped mirrors, all the areas are counted, through the mirror layer */
if (top_level_area_index == -1) if (top_level_area_index == -1)
@ -2956,7 +2958,7 @@ static int _allocate(struct alloc_handle *ah,
if (ah->area_multiple > 1 && if (ah->area_multiple > 1 &&
(ah->new_extents - alloc_state.allocated) % ah->area_multiple) { (ah->new_extents - alloc_state.allocated) % ah->area_multiple) {
log_error("Number of extents requested (%d) needs to be divisible by %d.", log_error("Number of extents requested (" FMTu32 ") needs to be divisible by " FMTu32 ".",
ah->new_extents - alloc_state.allocated, ah->new_extents - alloc_state.allocated,
ah->area_multiple); ah->area_multiple);
return 0; return 0;
@ -3765,23 +3767,23 @@ static int _lv_extend_layered_lv(struct alloc_handle *ah,
{ {
const struct segment_type *segtype; const struct segment_type *segtype;
struct logical_volume *sub_lv, *meta_lv; struct logical_volume *sub_lv, *meta_lv;
struct lv_segment *seg; struct lv_segment *seg = first_seg(lv);
uint32_t fa, s; uint32_t fa, s;
int clear_metadata = 0; int clear_metadata = 0;
segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_STRIPED); if (!(segtype = get_segtype_from_string(lv->vg->cmd, SEG_TYPE_NAME_STRIPED)))
return_0;
/* /*
* The component devices of a "striped" LV all go in the same * The component devices of a "striped" LV all go in the same
* LV. However, RAID has an LV for each device - making the * LV. However, RAID has an LV for each device - making the
* 'stripes' and 'stripe_size' parameters meaningless. * 'stripes' and 'stripe_size' parameters meaningless.
*/ */
if (seg_is_raid(first_seg(lv))) { if (seg_is_raid(seg)) {
stripes = 1; stripes = 1;
stripe_size = 0; stripe_size = 0;
} }
seg = first_seg(lv);
for (fa = first_area, s = 0; s < seg->area_count; s++) { for (fa = first_area, s = 0; s < seg->area_count; s++) {
if (is_temporary_mirror_layer(seg_lv(seg, s))) { if (is_temporary_mirror_layer(seg_lv(seg, s))) {
if (!_lv_extend_layered_lv(ah, seg_lv(seg, s), extents, if (!_lv_extend_layered_lv(ah, seg_lv(seg, s), extents,
@ -5173,7 +5175,7 @@ static struct logical_volume *_lvresize_volume(struct cmd_context *cmd,
log_error("Filesystem check failed."); log_error("Filesystem check failed.");
return NULL; return NULL;
} }
/* some filesystems supports online resize */ /* some filesystems support online resize */
} }
/* FIXME forks here */ /* FIXME forks here */