thin: raise required version to 1.4

Stay safe and require 1.4 (kernel 3.6) for non-power-of-2
support for thin pool chunk_size.

diff --git a/lib/thin/thin.c b/lib/thin/thin.c
index fd0c117e11522ffc683983fff4171000bf16ffb4..2b6c71f145b421780184b6a3555b787ee6d264b5 100644 (file)
--- a/lib/thin/thin.c
+++ b/lib/thin/thin.c
@@ -244,7 +244,7 @@ static int _thin_pool_add_target_line(struct dev_manager *dm,
        if (!(attr & THIN_FEATURE_BLOCK_SIZE) &&
            (seg->chunk_size & (seg->chunk_size - 1))) {
                log_error("Thin pool target does not support %uKiB chunk size "
-                         "(needs kernel >= 3.5).", seg->chunk_size / 2);
+                         "(needs kernel >= 3.6).", seg->chunk_size / 2);
                return 0;
        }
 
@@ -559,7 +559,7 @@ static int _thin_target_present(struct cmd_context *cmd,
                /* FIXME Log this as WARNING later only if the user asked for the feature to be used but it's not present */
                        log_debug("Target " THIN_MODULE " does not support external origins.");
 
-               if (maj >=1 && min >= 2)
+               if (maj >=1 && min >= 4)
                        _attrs |= THIN_FEATURE_BLOCK_SIZE;
                else
                /* FIXME Log this as WARNING later only if the user asked for the feature to be used but it's not present */

diff --git a/man/lvcreate.8.in b/man/lvcreate.8.in
index 0c3927882bc07523ef96c66d506c310cefd6dfbb..fb54cc64aa202ca18cac97d2e9da60fa1d259204 100644 (file)
--- a/man/lvcreate.8.in
+++ b/man/lvcreate.8.in
@@ -133,7 +133,7 @@ For thin pools the value must be between 64KiB and
 1048576KiB and the default value starts with 64 and scales
 up to fit the pool metadata size within 128MB,
 if the poolmetadata size is not specified.
-Older dm thin pool target version (<1.2) requires the value to be power of 2.
+Older dm thin pool target version (<1.4) requires the value to be power of 2.
 The newer version requires to be the multiple of 64KiB, however discard is
 not supported for non power of 2 values.
 Default unit is in kilobytes.

diff --git a/test/shell/lvcreate-thin-power2.sh b/test/shell/lvcreate-thin-power2.sh
index e1c793c5cab461d97a483f7239774422ed6a6dac..882b05cf2ce6e7a8044e9105de854da4254663d3 100644 (file)
--- a/test/shell/lvcreate-thin-power2.sh
+++ b/test/shell/lvcreate-thin-power2.sh
@@ -18,7 +18,7 @@
 #
 # Main
 #
-aux have_thin 1 2 0 || skip
+aux have_thin 1 4 0 || skip
 
 aux prepare_pvs 2 64