rpms/kmod-kvdo
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to version 8.2.0.2

Browse Source 
Rebased to latest upstream candidate.
- Resolves: rhbz#2071648

Signed-off-by: Andrew Walsh <awalsh@redhat.com>
This commit is contained in:
Andrew Walsh 2022-07-19 18:28:57 +00:00
parent d7a4df372b
commit f03cace3ff
4 changed files with 8 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -5,3 +5,4 @@
/kvdo-f9d6d18.tar.gz /kvdo-f9d6d18.tar.gz
/kvdo-819203a.tar.gz /kvdo-819203a.tar.gz
/kvdo-e209cfe.tar.gz /kvdo-e209cfe.tar.gz
/kvdo-127a993.tar.gz

36
fix_the_build.patch
View File

@ -1,36 +0,0 @@
diff -Naur kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11.orig/vdo/bio.c kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11/vdo/bio.c
--- kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11.orig/vdo/bio.c 2022-03-04 15:55:42.000000000 -0500
+++ kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11/vdo/bio.c 2022-06-28 16:19:04.181376685 -0400
@@ -186,7 +186,7 @@
unsigned int i;
#endif // >= 5.1.0
- bio_reset(bio); // Memsets most of the bio to reset most fields.
+ bio_reset(bio, bio->bi_bdev, bi_opf); // Memsets most of the bio to reset most fields.
vdo_set_bio_properties(bio, vio, callback, bi_opf, pbn);
if (data == NULL) {
return VDO_SUCCESS;
@@ -258,8 +258,8 @@
{
// Use __bio_clone_fast() to copy over the original bio iovec
// information and opflags.
- bio_reset(bio);
- __bio_clone_fast(bio, user_bio);
+ bio_reset(bio, bio->bi_bdev, bi_opf);
+ bio_init_clone(user_bio->bi_bdev, bio, user_bio, GFP_KERNEL);
vdo_set_bio_properties(bio, vio, callback, bi_opf, pbn);
}
diff -Naur kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11.orig/vdo/vdo.c kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11/vdo/vdo.c
--- kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11.orig/vdo/vdo.c 2022-03-04 15:55:42.000000000 -0500
+++ kvdo-e209cfeb3fe1dfac03b34041a3deefdb077e3e11/vdo/vdo.c 2022-06-28 16:02:37.202376685 -0400
@@ -207,7 +207,8 @@
int result;
struct bio bio;
- bio_init(&bio, 0, 0);
+ bio_init(&bio, get_vdo_backing_device(vdo), 0, 0,
+ REQ_OP_WRITE | REQ_PREFLUSH);
bio_set_dev(&bio, get_vdo_backing_device(vdo));
bio.bi_opf = REQ_OP_WRITE | REQ_PREFLUSH;
submit_bio_wait(&bio);

10
kmod-kvdo.spec
View File

@ -1,5 +1,5 @@
%global commit e209cfeb3fe1dfac03b34041a3deefdb077e3e11 %global commit 127a993f34010e4d8b05e46c4af2a9295c4477d0
%global gittag 8.1.1.371 %global gittag 8.2.0.2
%global shortcommit %(c=%{commit}; echo ${c:0:7}) %global shortcommit %(c=%{commit}; echo ${c:0:7})
%define spec_release 41 %define spec_release 41
@ -12,7 +12,6 @@
%define kmod_devel_package 0 %define kmod_devel_package 0
Source0: https://github.com/dm-vdo/%{kmod_name}/archive/%{commit}/%{kmod_name}-%{shortcommit}.tar.gz Source0: https://github.com/dm-vdo/%{kmod_name}/archive/%{commit}/%{kmod_name}-%{shortcommit}.tar.gz
Patch1: fix_the_build.patch
%define findpat %( echo "%""P" ) %define findpat %( echo "%""P" )
@ -104,7 +103,6 @@ printf '%s\n' "${modules[@]}" | %{_sbindir}/weak-modules --dracut=/usr/bin/dracu
%prep %prep
%setup -n %{kmod_name}-%{commit} %setup -n %{kmod_name}-%{commit}
%patch1 -p1
%{nil} %{nil}
set -- * set -- *
mkdir source mkdir source
@ -153,6 +151,10 @@ install -m 644 -D source/greylist.txt $RPM_BUILD_ROOT/usr/share/doc/kmod-%{kmod_
rm -rf $RPM_BUILD_ROOT rm -rf $RPM_BUILD_ROOT
%changelog %changelog
* Tue Jul 19 2022 - Andy Walsh <awalsh@redhat.com> - 8.2.0.2-41
- Rebased to latest upstream candidate.
- Resolves: rhbz#2071648
* Sat Jul 16 2022 - Susan LeGendre-McGhee <slegendr@redhat.com> - 8.1.1.371-41 * Sat Jul 16 2022 - Susan LeGendre-McGhee <slegendr@redhat.com> - 8.1.1.371-41
- Rebuilt for latest kernel. - Rebuilt for latest kernel.
- Related: rhbz#2060486 - Related: rhbz#2060486

2
sources
View File

@ -1 +1 @@
SHA512 (kvdo-e209cfe.tar.gz) = 4b47fca8c0fdc4b5f2662f2e9a4d2b7b3e190fd9e933b2edfbabfbdee6bcfdbf4faa728efa0ac948f6f2f64f2b9d93d824ee14fbef8371ee33158b58882ce9c6 SHA512 (kvdo-127a993.tar.gz) = f774ca12b662f9f2d11ba0024eac4f8c06222dff73b79ed5d80173186de26b725fcd19ff680773f80bcdf21bfc92d44fa12ac6cb78360d3a370b8a48e2798569