summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2015-07-10 13:51:15 +0200
committerZdenek Kabelac <zkabelac@redhat.com>2015-07-15 13:10:22 +0200
commita7101e7bfb1b8f5f792974a3b5f39fa4fcdb5656 (patch)
tree45914fcf6449220b640717a4bb4bb4470a55eebd
parentbeb65056cf450ac14c2354f87a981cd5a379560c (diff)
downloadlvm2-a7101e7bfb1b8f5f792974a3b5f39fa4fcdb5656.tar.gz
cleanup: drop duplicated seg test
Test is already in seg_is_pool() if branch. and one minor indent fix.
-rw-r--r--lib/metadata/merge.c3
-rw-r--r--tools/lvcreate.c2
2 files changed, 2 insertions, 3 deletions
diff --git a/lib/metadata/merge.c b/lib/metadata/merge.c
index 530b4e439..e38cb5336 100644
--- a/lib/metadata/merge.c
+++ b/lib/metadata/merge.c
@@ -237,8 +237,7 @@ int check_lv_segments(struct logical_volume *lv, int complete_vg)
inc_error_count;
}
- if (seg_is_pool(seg) &&
- !validate_pool_chunk_size(lv->vg->cmd, seg->segtype, seg->chunk_size)) {
+ if (!validate_pool_chunk_size(lv->vg->cmd, seg->segtype, seg->chunk_size)) {
log_error("LV %s: %s segment %u has invalid chunk size %u.",
lv->name, seg->segtype->name, seg_count, seg->chunk_size);
inc_error_count;
diff --git a/tools/lvcreate.c b/tools/lvcreate.c
index 259513077..12b5166db 100644
--- a/tools/lvcreate.c
+++ b/tools/lvcreate.c
@@ -587,7 +587,7 @@ static int _read_cache_params(struct cmd_context *cmd,
}
static int _read_activation_params(struct cmd_context *cmd,
- struct volume_group *vg,
+ struct volume_group *vg,
struct lvcreate_params *lp)
{
unsigned pagesize = lvm_getpagesize() >> SECTOR_SHIFT;