summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZdenek Kabelac <zkabelac@redhat.com>2016-01-15 14:39:58 +0100
committerZdenek Kabelac <zkabelac@redhat.com>2016-01-20 13:44:47 +0100
commit4b9ae55a8d691eb15d34dce74f00230bd2423c5b (patch)
tree741c564e5b255d80f23990db49f2b4888f1172c4
parentc99ca6f430eb3650115882b5b6a8f9dde6212b12 (diff)
downloadlvm2-4b9ae55a8d691eb15d34dce74f00230bd2423c5b.tar.gz
cleanup: shuffle check of threshold
Check first threshold and then policy_amount.
-rw-r--r--lib/metadata/lv_manip.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/lib/metadata/lv_manip.c b/lib/metadata/lv_manip.c
index e0312e322..1975c836b 100644
--- a/lib/metadata/lv_manip.c
+++ b/lib/metadata/lv_manip.c
@@ -4445,15 +4445,18 @@ static int _adjust_policy_params(struct cmd_context *cmd,
}
}
- if (!policy_amount && policy_threshold < 100) {
+ if (policy_threshold >= 100) {
+ lp->extents = lp->poolmetadatasize = 0;
+ lp->sizeargs = 0;
+ return 1; /* nothing to do */
+ }
+
+ if (!policy_amount) {
log_error("Can't extend %s with %s autoextend percent set to 0%%.",
display_lvname(lv), first_seg(lv)->segtype->name);
return 0;
}
- if (policy_threshold >= 100)
- return 1; /* nothing to do */
-
if (!lv_is_active_locally(lv)) {
log_error("Can't read state of locally inactive LV %s.",
display_lvname(lv));