From 925d62b8efea773022147c75e7f216d74b96fe9b Mon Sep 17 00:00:00 2001 From: Chung Chung Date: Fri, 17 Jan 2025 11:32:25 -0500 Subject: [PATCH] Rebuilt for latest kernel. Related: RHEL-61201 Signed-off-by: Chung Chung --- fix_the_build.patch | 15 +++++++++++++++ kmod-kvdo.spec | 6 ++++++ 2 files changed, 21 insertions(+) create mode 100644 fix_the_build.patch diff --git a/fix_the_build.patch b/fix_the_build.patch new file mode 100644 index 0000000..4489d50 --- /dev/null +++ b/fix_the_build.patch @@ -0,0 +1,15 @@ +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; + + /* 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; + + /* + * Sets the maximum discard size that will be passed into VDO. This diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec index fcc9bd6..afa87ac 100644 --- a/kmod-kvdo.spec +++ b/kmod-kvdo.spec @@ -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} %patch0 -p1 %patch1 -p1 +%patch2 -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 +* Fri Jan 17 2025 - Chung Chung - 8.2.5.2-155.el9 +- TEMPORARY FIX to correct build failures regarding blk_limits_io_{min,opt} error +- Related: RHEL-61201 + * Fri Jan 17 2025 - Chung Chung - 8.2.5.2-155.el9 - Rebuilt for latest kernel. - Related: RHEL-61201