shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-03-06 00:58:48 +03:00
Code Releases Activity

raid_manip: debug messages changed; comments

Browse Source
This commit is contained in:
Heinz Mauelshagen 2015-06-11 12:42:04 +02:00
parent 928c7ecd52
commit f3a9262340
1 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
lib/metadata/raid_manip.c
View File

@ -2342,11 +2342,12 @@ int lv_raid_merge(struct logical_volume *image_lv)
}
/*
* Rename all data sub LVs of @lv to mirror
* Adjust all data sub LVs of @lv to mirror
* or raid name depending on @direction
* adjusting their lv status
*/
enum mirror_raid_conv { mirror_to_raid1 = 0, raid1_to_mirror };
static int _rename_data_lvs(struct logical_volume *lv, enum mirror_raid_conv direction)
static int _adjust_data_lvs(struct logical_volume *lv, enum mirror_raid_conv direction)
{
uint32_t s;
char *p;
@ -2421,16 +2422,11 @@ static int _convert_mirror_to_raid(struct logical_volume *lv,
if (!_alloc_and_add_rmeta_devs_for_lv(lv))
return 0;
/* Rename all data sub lvs for "*_rimage_*" to "*_mimage_*" */
log_debug_metadata("Renaming data LVs of %s", display_lvname(lv));
if (!_rename_data_lvs(lv, mirror_to_raid1))
/* Rename all data sub lvs from "*_mimage_*" to "*_rimage_*" and set their status */
log_debug_metadata("Adjust data LVs of %s", display_lvname(lv));
if (!_adjust_data_lvs(lv, mirror_to_raid1))
return 0;
for (s = 0; s < seg->area_count; s++) {
seg_lv(seg, s)->status &= ~MIRROR_IMAGE;
seg_lv(seg, s)->status |= RAID_IMAGE;
}
init_mirror_in_sync(1);
seg->segtype = new_segtype;
@ -2498,16 +2494,11 @@ static int _convert_raid1_to_mirror(struct logical_volume *lv,
seg->meta_areas = NULL;
/* Rename all data sub lvs for "*_rimage_*" to "*_mimage_*" */
log_debug_metadata("Renaming data LVs of %s", display_lvname(lv));
if (!_rename_data_lvs(lv, raid1_to_mirror))
/* Rename all data sub lvs from "*_rimage_*" to "*_mimage_*" and set their status */
log_debug_metadata("Adjust data LVs of %s", display_lvname(lv));
if (!_adjust_data_lvs(lv, raid1_to_mirror))
return 0;
for (s = 0; s < seg->area_count; s++) {
seg_lv(seg, s)->status &= ~RAID_IMAGE;
seg_lv(seg, s)->status |= MIRROR_IMAGE;
}
seg->segtype = new_segtype;
lv->status &= ~RAID;
seg->status &= ~RAID;