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

Simplify logic to create 'attr' strings.

Browse Source 
This patch addresses code review request to simplify creation of 'attr'
strings.  The simplification is done in this separate patch to more
easily review and ensure the simplification is done without error.
This commit is contained in:
Dave Wysochanski 2010-09-30 14:07:19 +00:00
parent 14663348d0
commit 4bbadbe1cf
3 changed files with 13 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
lib/metadata/lv.c
View File

@ -61,28 +61,16 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
repstr[0] = 'v';
/* Origin takes precedence over Mirror */
else if (lv_is_origin(lv)) {
if (lv_is_merging_origin(lv))
repstr[0] = 'O';
else
repstr[0] = 'o';
repstr[0] = (lv_is_merging_origin(lv)) ? 'O' : 'o';
}
else if (lv->status & MIRRORED) {
if (lv->status & MIRROR_NOTSYNCED)
repstr[0] = 'M';
else
repstr[0] = 'm';
repstr[0] = (lv->status & MIRROR_NOTSYNCED) ? 'M' : 'm';
}else if (lv->status & MIRROR_IMAGE)
if (_lv_mimage_in_sync(lv))
repstr[0] = 'i';
else
repstr[0] = 'I';
repstr[0] = (_lv_mimage_in_sync(lv)) ? 'i' : 'I';
else if (lv->status & MIRROR_LOG)
repstr[0] = 'l';
else if (lv_is_cow(lv)) {
if (lv_is_merging_cow(lv))
repstr[0] = 'S';
else
repstr[0] = 's';
repstr[0] = (lv_is_merging_cow(lv)) ? 'S' : 's';
} else
repstr[0] = '-';
@ -100,10 +88,7 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
if (lv->status & LOCKED)
repstr[2] = toupper(repstr[2]);
if (lv->status & FIXED_MINOR)
repstr[3] = 'm'; /* Fixed Minor */
else
repstr[3] = '-';
repstr[3] = (lv->status & FIXED_MINOR) ? 'm' : '-';
if (lv_info(lv->vg->cmd, lv, 0, &info, 1, 0) && info.exists) {
if (info.suspended)
@ -126,10 +111,7 @@ char *lv_attr_dup(struct dm_pool *mem, const struct logical_volume *lv)
repstr[4] = 'I'; /* Invalid snapshot */
}
if (info.open_count)
repstr[5] = 'o'; /* Open */
else
repstr[5] = '-';
repstr[5] = (info.open_count) ? 'o' : '-';
} else {
repstr[4] = '-';
repstr[5] = '-';

11
lib/metadata/pv.c
View File

@ -172,15 +172,8 @@ char *pv_attr_dup(struct dm_pool *mem, const struct physical_volume *pv)
return NULL;
}
if (pv->status & ALLOCATABLE_PV)
repstr[0] = 'a';
else
repstr[0] = '-';
if (pv->status & EXPORTED_VG)
repstr[1] = 'x';
else
repstr[1] = '-';
repstr[0] = (pv->status & ALLOCATABLE_PV) ? 'a' : '-';
repstr[1] = (pv->status & EXPORTED_VG) ? 'x' : '-';
return repstr;
}

30
lib/metadata/vg.c
View File

@ -443,31 +443,11 @@ char *vg_attr_dup(struct dm_pool *mem, const struct volume_group *vg)
return NULL;
}
if (vg->status & LVM_WRITE)
repstr[0] = 'w';
else
repstr[0] = 'r';
if (vg_is_resizeable(vg))
repstr[1] = 'z';
else
repstr[1] = '-';
if (vg_is_exported(vg))
repstr[2] = 'x';
else
repstr[2] = '-';
if (vg_missing_pv_count(vg))
repstr[3] = 'p';
else
repstr[3] = '-';
repstr[0] = (vg->status & LVM_WRITE) ? 'w' : 'r';
repstr[1] = (vg_is_resizeable(vg)) ? 'z' : '-';
repstr[2] = (vg_is_exported(vg)) ? 'x' : '-';
repstr[3] = (vg_missing_pv_count(vg)) ? 'p' : '-';
repstr[4] = alloc_policy_char(vg->alloc);
if (vg_is_clustered(vg))
repstr[5] = 'c';
else
repstr[5] = '-';
repstr[5] = (vg_is_clustered(vg)) ? 'c' : '-';
return repstr;
}