From 29b766957191fa752ff88491045b951572429cba Mon Sep 17 00:00:00 2001 From: Andrew Walsh Date: Wed, 24 Aug 2022 16:17:14 +0000 Subject: [PATCH] Temporarily stop validating the logical size specified from the table line. Until the LVM tooling can be updated to use accurate sizes, this check cannot be restored. Related: rhbz#2071648 Signed-off-by: Andrew Walsh --- kmod-kvdo.spec | 9 ++++- ...-logical-space-check-from-table-line.patch | 34 +++++++++++++++++++ 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 removed-logical-space-check-from-table-line.patch diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec index 566434b..8e38ce8 100644 --- a/kmod-kvdo.spec +++ b/kmod-kvdo.spec @@ -1,7 +1,7 @@ %global commit 6077a128b887100e478048f67e6b8734cddd0ec7 %global gittag 8.2.0.18 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%define spec_release 45 +%define spec_release 46 %define kmod_name kvdo %define kmod_driver_version %{gittag} @@ -13,6 +13,7 @@ Source0: https://github.com/dm-vdo/%{kmod_name}/archive/%{commit}/%{kmod_name}-%{shortcommit}.tar.gz Patch0: add_lz4_dependency.patch +Patch1: removed-logical-space-check-from-table-line.patch %define findpat %( echo "%""P" ) @@ -105,6 +106,7 @@ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --dracut=/usr/bin/dracu %prep %setup -n %{kmod_name}-%{commit} %patch0 -p1 +%patch1 -p1 %{nil} set -- * mkdir source @@ -153,6 +155,11 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Aug 24 2022 - Andy Walsh - 8.2.0.18-46 +- Temporarily dropped a check that validates the logical size specified from + the table line. +- Related: rhbz#2071648 + * Tue Aug 23 2022 - Andy Walsh - 8.2.0.18-45 - Fixed a race handling timeouts of dedupe requests. - Resolves: rhbz#2115504 diff --git a/removed-logical-space-check-from-table-line.patch b/removed-logical-space-check-from-table-line.patch new file mode 100644 index 0000000..3afc90d --- /dev/null +++ b/removed-logical-space-check-from-table-line.patch @@ -0,0 +1,34 @@ +From 8fb4ef85097e7b46cb3604612a49e480efd4465a Mon Sep 17 00:00:00 2001 +From: Andrew Walsh +Date: Wed, 24 Aug 2022 12:00:12 -0400 +Subject: [PATCH] Removed logical space check from table line. + +Until the LVM tooling can be updated to use accurate sizes, this check +can't be implemented. + +Signed-off-by: Andrew Walsh +--- + vdo/vdo-component.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/vdo/vdo-component.c b/vdo/vdo-component.c +index ac1ac1f7..50ba438b 100644 +--- a/vdo/vdo-component.c ++++ b/vdo/vdo-component.c +@@ -303,13 +303,6 @@ int vdo_validate_config(const struct vdo_config *config, + if (result != UDS_SUCCESS) { + return result; + } +- +- if (logical_block_count != config->logical_blocks) { +- uds_log_error("A logical size of %llu blocks was specified, but that differs from the %llu blocks configured in the vdo super block", +- (unsigned long long) logical_block_count, +- (unsigned long long) config->logical_blocks); +- return VDO_PARAMETER_MISMATCH; +- } + } + + result = ASSERT(config->logical_blocks <= MAXIMUM_VDO_LOGICAL_BLOCKS, +-- +2.37.1 +