|
 |
b83e05 |
conf/example.conf.in | 6 ++++++
|
|
|
b83e05 |
lib/config/config_settings.h | 2 +-
|
|
|
b83e05 |
lib/config/defaults.h | 1 +
|
|
|
b83e05 |
3 files changed, 8 insertions(+), 1 deletion(-)
|
|
|
b83e05 |
|
|
|
b83e05 |
diff --git a/conf/example.conf.in b/conf/example.conf.in
|
|
|
b83e05 |
index 6f7b161..9fa1235 100644
|
|
|
b83e05 |
--- a/conf/example.conf.in
|
|
|
b83e05 |
+++ b/conf/example.conf.in
|
|
|
b83e05 |
@@ -326,6 +326,12 @@ devices {
|
|
|
b83e05 |
# Enabling this setting allows the VG to be used as usual even with
|
|
|
b83e05 |
# uncertain devices.
|
|
|
b83e05 |
allow_changes_with_duplicate_pvs = 1
|
|
|
b83e05 |
+
|
|
|
b83e05 |
+ # Configuration option devices/allow_mixed_block_sizes.
|
|
|
b83e05 |
+ # Allow PVs in the same VG with different logical block sizes.
|
|
|
b83e05 |
+ # When allowed, the user is responsible to ensure that an LV is
|
|
|
b83e05 |
+ # using PVs with matching block sizes when necessary.
|
|
|
b83e05 |
+ allow_mixed_block_sizes = 1
|
|
|
b83e05 |
}
|
|
|
b83e05 |
|
|
|
b83e05 |
# Configuration section allocation.
|
|
|
b83e05 |
diff --git a/lib/config/config_settings.h b/lib/config/config_settings.h
|
|
|
b83e05 |
index 622e982..055b883 100644
|
|
|
b83e05 |
--- a/lib/config/config_settings.h
|
|
|
b83e05 |
+++ b/lib/config/config_settings.h
|
|
|
b83e05 |
@@ -470,7 +470,7 @@ cfg(devices_allow_changes_with_duplicate_pvs_CFG, "allow_changes_with_duplicate_
|
|
|
b83e05 |
"Enabling this setting allows the VG to be used as usual even with\n"
|
|
|
b83e05 |
"uncertain devices.\n")
|
|
|
b83e05 |
|
|
|
b83e05 |
-cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, 0, vsn(2, 3, 6), NULL, 0, NULL,
|
|
|
b83e05 |
+cfg(devices_allow_mixed_block_sizes_CFG, "allow_mixed_block_sizes", devices_CFG_SECTION, 0, CFG_TYPE_BOOL, DEFAULT_ALLOW_MIXED_BLOCK_SIZES, vsn(2, 2, 186), NULL, 0, NULL,
|
|
|
b83e05 |
"Allow PVs in the same VG with different logical block sizes.\n"
|
|
|
b83e05 |
"When allowed, the user is responsible to ensure that an LV is\n"
|
|
|
b83e05 |
"using PVs with matching block sizes when necessary.\n")
|
|
|
b83e05 |
diff --git a/lib/config/defaults.h b/lib/config/defaults.h
|
|
|
b83e05 |
index 0d55928..e689208 100644
|
|
|
b83e05 |
--- a/lib/config/defaults.h
|
|
|
b83e05 |
+++ b/lib/config/defaults.h
|
|
|
b83e05 |
@@ -46,6 +46,7 @@
|
|
|
b83e05 |
#define DEFAULT_ISSUE_DISCARDS 0
|
|
|
b83e05 |
#define DEFAULT_PV_MIN_SIZE_KB 2048
|
|
|
b83e05 |
#define DEFAULT_ALLOW_CHANGES_WITH_DUPLICATE_PVS 1
|
|
|
b83e05 |
+#define DEFAULT_ALLOW_MIXED_BLOCK_SIZES 1
|
|
|
b83e05 |
|
|
|
b83e05 |
#define DEFAULT_LOCKING_LIB "liblvm2clusterlock.so"
|
|
|
b83e05 |
#define DEFAULT_ERROR_WHEN_FULL 0
|