From 2ebc43a241542a6362c752e5a2cf94973a11d425 Mon Sep 17 00:00:00 2001 From: Susan LeGendre-McGhee Date: Wed, 26 Oct 2022 15:12:42 +0000 Subject: [PATCH] Temporarily patched to remove bdevname usage and correct build failure. Related: rhbz#2119820 Signed-off-by: Susan LeGendre-McGhee --- kmod-kvdo.spec | 6 ++++++ remove_bdevname.patch | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 remove_bdevname.patch diff --git a/kmod-kvdo.spec b/kmod-kvdo.spec index b948f5d..3abc3eb 100644 --- a/kmod-kvdo.spec +++ b/kmod-kvdo.spec @@ -14,6 +14,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: remove_bdevname.patch %define findpat %( echo "%""P" ) @@ -107,6 +108,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 @@ -155,6 +157,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_ rm -rf $RPM_BUILD_ROOT %changelog +* Wed Oct 26 2022 - Susan LeGendre-McGhee - 8.2.0.18-52.el9_2 +- Temporarily patched to remove bdevname usage and correct build failure. +- Related: rhbz#2119820 + * Wed Oct 26 2022 - Susan LeGendre-McGhee - 8.2.0.18-52.el9_2 - Rebuilt for latest kernel. - Related: rhbz#2119820 diff --git a/remove_bdevname.patch b/remove_bdevname.patch new file mode 100644 index 0000000..a77d68f --- /dev/null +++ b/remove_bdevname.patch @@ -0,0 +1,22 @@ +diff -Naur kvdo-6077a128b887100e478048f67e6b8734cddd0ec7.orig/vdo/dm-vdo-target.c kvdo-6077a128b887100e478048f67e6b8734cddd0ec7/vdo/dm-vdo-target.c +--- kvdo-6077a128b887100e478048f67e6b8734cddd0ec7.orig/vdo/dm-vdo-target.c 2022-08-22 15:58:08.000000000 -0400 ++++ kvdo-6077a128b887100e478048f67e6b8734cddd0ec7/vdo/dm-vdo-target.c 2022-10-26 10:47:11.202791018 -0400 +@@ -129,7 +129,6 @@ + struct vdo *vdo = get_vdo_for_target(ti); + struct vdo_statistics *stats; + struct device_config *device_config; +- char name_buffer[BDEVNAME_SIZE]; + /* + * N.B.: The DMEMIT macro uses the variables named "sz", "result", + * "maxlen". +@@ -143,8 +142,8 @@ + vdo_fetch_statistics(vdo, &vdo->stats_buffer); + stats = &vdo->stats_buffer; + +- DMEMIT("/dev/%s %s %s %s %s %llu %llu", +- bdevname(vdo_get_backing_device(vdo), name_buffer), ++ DMEMIT("/dev/%pg %s %s %s %s %llu %llu", ++ vdo_get_backing_device(vdo), + stats->mode, + stats->in_recovery_mode ? "recovering" : "-", + vdo_get_dedupe_index_state_name(vdo->hash_zones),