diff options
| author | Zdenek Kabelac <zkabelac@redhat.com> | 2012-04-11 12:30:48 +0000 |
|---|---|---|
| committer | Zdenek Kabelac <zkabelac@redhat.com> | 2012-04-11 12:30:48 +0000 |
| commit | 9bdff1ee5ca6e563af7ac9deed30d4f48af16ce9 (patch) | |
| tree | 6b75ad6c8cf21a0943a1bc1d083a6bb06bd807ae /tools | |
| parent | 30bd294fc6b310e7d59ed7b0f654257f3b202c9c (diff) | |
| download | lvm2-9bdff1ee5ca6e563af7ac9deed30d4f48af16ce9.tar.gz lvm2-9bdff1ee5ca6e563af7ac9deed30d4f48af16ce9.tar.xz lvm2-9bdff1ee5ca6e563af7ac9deed30d4f48af16ce9.zip | |
Move check for min strip size
and remove few asigns that are not needed.
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/lvresize.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/tools/lvresize.c b/tools/lvresize.c index 4b093699..ab7b4fa9 100644 --- a/tools/lvresize.c +++ b/tools/lvresize.c @@ -367,12 +367,12 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, { struct logical_volume *lv; struct lvinfo info; - uint32_t stripesize_extents = 0; - uint32_t seg_stripes = 0, seg_stripesize = 0, seg_size = 0; + uint32_t stripesize_extents; + uint32_t seg_stripes = 0, seg_stripesize = 0, seg_size; uint32_t seg_mirrors = 0; - uint32_t extents_used = 0; + uint32_t extents_used; uint32_t size_rest; - uint32_t pv_extent_count = 0; + uint32_t pv_extent_count; alloc_policy_t alloc; struct logical_volume *lock_lv; struct lv_list *lvl; @@ -665,6 +665,12 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, } if (lp->stripes > 1) { + if (lp->stripe_size < STRIPE_SIZE_MIN) { + log_error("Invalid stripe size %s", + display_size(cmd, (uint64_t) lp->stripe_size)); + return EINVALID_CMD_LINE; + } + if (!(stripesize_extents = lp->stripe_size / vg->extent_size)) stripesize_extents = 1; @@ -684,11 +690,6 @@ static int _lvresize(struct cmd_context *cmd, struct volume_group *vg, lp->extents = lp->extents - size_rest; } - if (lp->stripe_size < STRIPE_SIZE_MIN) { - log_error("Invalid stripe size %s", - display_size(cmd, (uint64_t) lp->stripe_size)); - return EINVALID_CMD_LINE; - } } if (lp->extents < lv->le_count) { |