From ec9bb21827d6ba55b918f901b618a80714679653 Mon Sep 17 00:00:00 2001 From: Chung Chung Date: Mon, 8 Dec 2025 13:54:00 -0500 Subject: [PATCH] TEMPORARY FIX to correct build failures regarding from_timer error Resolves: RHEL-112497 Signed-off-by: Chung Chung --- fix_the_build.patch | 23 ++++++++++------------- kmod-kvdo.spec | 10 ++++++++-- 2 files changed, 18 insertions(+), 15 deletions(-) diff --git a/fix_the_build.patch b/fix_the_build.patch index 4489d50..2b74002 100644 --- a/fix_the_build.patch +++ b/fix_the_build.patch @@ -1,15 +1,12 @@ -diff -Naur kvdo-e58f053ed24c46e72c5b7ad7ff029d50c11e7dc3.orig/vdo/dm-vdo-target.c kvdo-e58f053ed24c46e72c5b7ad7ff029d50c11e7dc3/vdo/dm-vdo-target.c ---- kvdo-e58f053ed24c46e72c5b7ad7ff029d50c11e7dc3.orig/vdo/dm-vdo-target.c 2024-11-06 11:18:49.000000000 -0500 -+++ kvdo-e58f053ed24c46e72c5b7ad7ff029d50c11e7dc3/vdo/dm-vdo-target.c 2025-01-17 10:47:04.527655244 -0500 -@@ -73,9 +73,9 @@ - limits->physical_block_size = VDO_BLOCK_SIZE; +diff -Naur kvdo-bc83d8b1b954eeeab83bbc85ce6d4dadf646a315.orig/vdo/dedupe.c kvdo-bc83d8b1b954eeeab83bbc85ce6d4dadf646a315/vdo/dedupe.c +--- kvdo-bc83d8b1b954eeeab83bbc85ce6d4dadf646a315.orig/vdo/dedupe.c 2025-05-09 16:51:36.000000000 -0400 ++++ kvdo-bc83d8b1b954eeeab83bbc85ce6d4dadf646a315/vdo/dedupe.c 2025-12-08 13:40:04.928386755 -0500 +@@ -2965,7 +2965,7 @@ - /* The minimum io size for random io */ -- blk_limits_io_min(limits, VDO_BLOCK_SIZE); -+ limits->io_min = VDO_BLOCK_SIZE; - /* The optimal io size for streamed/sequential io */ -- blk_limits_io_opt(limits, VDO_BLOCK_SIZE); -+ limits->io_opt = VDO_BLOCK_SIZE; + static void timeout_index_operations(struct timer_list *t) + { +- struct hash_zone *zone = from_timer(zone, t, timer); ++ struct hash_zone *zone = timer_container_of(zone, t, timer); - /* - * Sets the maximum discard size that will be passed into VDO. This + if (change_timer_state(zone, + DEDUPE_QUERY_TIMER_RUNNING, diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec index fd2e687..aed1a74 100644 --- a/kmod-kvdo.spec +++ b/kmod-kvdo.spec @@ -1,12 +1,12 @@ %global commit bc83d8b1b954eeeab83bbc85ce6d4dadf646a315 %global gittag 8.2.6.3 %global shortcommit %(c=%{commit}; echo ${c:0:7}) -%define spec_release 182 +%define spec_release 183 %define kmod_name kvdo %define kmod_driver_version %{gittag} %define kmod_rpm_release %{spec_release} -%define kmod_kernel_version 5.14.0-645.el9 +%define kmod_kernel_version 5.14.0-648.el9 %define kmod_kernel_extra %(sed 's/.*-\\([0-9]\\+\\).*/\\1/' <<< "%{kmod_kernel_version}") %define kmod_headers_version %(rpm -qa kernel-devel | sed 's/^kernel-devel-//') %define kmod_kbuild_dir . @@ -15,6 +15,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 +Patch2: fix_the_build.patch %define findpat %( echo "%""P" ) @@ -109,6 +110,7 @@ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --dracut=/usr/bin/dracu %setup -n %{kmod_name}-%{commit} %patch 0 -p1 %patch 1 -p1 +%patch 2 -p1 %{nil} set -- * mkdir source @@ -158,6 +160,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog +* Mon Dec 08 2025 - Chung Chung - 8.2.5.10-183.el9 +- TEMPORARY FIX to correct build failures regarding from_timer error +- Resolves: RHEL-112497 + * Mon Dec 01 2025 - Chung Chung - 8.2.5.10-182.el9 - Rebuilt for latest kernel. - Resolves: RHEL-112497