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

lvconvert: Pass region_size to lv_raid_convert.

Browse Source
This commit is contained in:
Alasdair G Kergon 2016-08-02 23:51:20 +01:00
parent a234cebbed
commit fdc3fcbfce
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/metadata/metadata-exported.h
View File

@ -1201,6 +1201,7 @@ int lv_raid_convert(struct logical_volume *lv,
int yes, int force, int yes, int force,
const unsigned stripes, const unsigned stripes,
const unsigned new_stripe_size, const unsigned new_stripe_size,
const uint32_t new_region_size,
struct dm_list *allocate_pvs); struct dm_list *allocate_pvs);
int lv_raid_replace(struct logical_volume *lv, struct dm_list *remove_pvs, int lv_raid_replace(struct logical_volume *lv, struct dm_list *remove_pvs,
struct dm_list *allocate_pvs); struct dm_list *allocate_pvs);

8
lib/metadata/raid_manip.c
View File

@ -2231,6 +2231,7 @@ static struct lv_segment *_convert_striped_to_raid0(struct logical_volume *lv,
unsigned new_image_count, \ unsigned new_image_count, \
const unsigned new_stripes, \ const unsigned new_stripes, \
uint32_t new_stripe_size, \ uint32_t new_stripe_size, \
const uint32_t new_region_size, \
struct dm_list *allocate_pvs struct dm_list *allocate_pvs
typedef int (*takeover_fn_t)(TAKEOVER_FN_ARGS); typedef int (*takeover_fn_t)(TAKEOVER_FN_ARGS);
@ -2737,6 +2738,7 @@ int lv_raid_convert(struct logical_volume *lv,
int yes, int force, int yes, int force,
const unsigned new_stripes, const unsigned new_stripes,
const unsigned new_stripe_size, const unsigned new_stripe_size,
const uint32_t new_region_size,
struct dm_list *allocate_pvs) struct dm_list *allocate_pvs)
{ {
struct lv_segment *seg = first_seg(lv); struct lv_segment *seg = first_seg(lv);
@ -2765,7 +2767,8 @@ int lv_raid_convert(struct logical_volume *lv,
/* Exit without doing activation checks if the combination isn't possible */ /* Exit without doing activation checks if the combination isn't possible */
if (_takeover_not_possible(takeover_fn)) if (_takeover_not_possible(takeover_fn))
return takeover_fn(lv, new_segtype, yes, force, new_image_count, new_stripes, stripe_size, allocate_pvs); return takeover_fn(lv, new_segtype, yes, force, new_image_count, new_stripes, stripe_size,
new_region_size, allocate_pvs);
log_verbose("Converting %s from %s to %s.", log_verbose("Converting %s from %s to %s.",
display_lvname(lv), lvseg_name(first_seg(lv)), display_lvname(lv), lvseg_name(first_seg(lv)),
@ -2795,7 +2798,8 @@ int lv_raid_convert(struct logical_volume *lv,
return 0; return 0;
} }
return takeover_fn(lv, new_segtype, yes, force, new_image_count, new_stripes, stripe_size, allocate_pvs); return takeover_fn(lv, new_segtype, yes, force, new_image_count, new_stripes, stripe_size,
new_region_size, allocate_pvs);
} }
static int _remove_partial_multi_segment_image(struct logical_volume *lv, static int _remove_partial_multi_segment_image(struct logical_volume *lv,

3
tools/lvconvert.c
View File

@ -1900,7 +1900,8 @@ static int _lvconvert_raid(struct logical_volume *lv, struct lvconvert_params *l
log_error("RAID module does not support RAID0."); log_error("RAID module does not support RAID0.");
return 0; return 0;
} }
if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size, lp->pvh)) if (!lv_raid_convert(lv, lp->segtype, lp->yes, lp->force, lp->stripes, lp->stripe_size,
lp->region_size, lp->pvh))
return_0; return_0;
log_print_unless_silent("Logical volume %s successfully converted.", log_print_unless_silent("Logical volume %s successfully converted.",
display_lvname(lv)); display_lvname(lv));