diff options
author | Dave Wysochanski <dwysocha@redhat.com> | 2010-09-30 14:07:19 +0000 |
---|---|---|
committer | Dave Wysochanski <dwysocha@redhat.com> | 2010-09-30 14:07:19 +0000 |
commit | 4bbadbe1cfbb6855f31a99432661c39c74d4288e (patch) | |
tree | 839cd40ad9e3840e3f7cf43fd412aaf5ac311716 /lib/metadata/vg.c | |
parent | 14663348d03bdb8b6f30e9a30f0b65b2f0a659d9 (diff) | |
download | lvm2-4bbadbe1cfbb6855f31a99432661c39c74d4288e.tar.gz lvm2-4bbadbe1cfbb6855f31a99432661c39c74d4288e.tar.xz lvm2-4bbadbe1cfbb6855f31a99432661c39c74d4288e.zip |
Simplify logic to create 'attr' strings.
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.
Diffstat (limited to 'lib/metadata/vg.c')
-rw-r--r-- | lib/metadata/vg.c | 30 |
1 files changed, 5 insertions, 25 deletions
diff --git a/lib/metadata/vg.c b/lib/metadata/vg.c index 3315c7e1..07cb60ab 100644 --- a/lib/metadata/vg.c +++ b/lib/metadata/vg.c @@ -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; } |