diff -Nru dm-writeboost-2.2.9/debian/changelog dm-writeboost-2.2.9/debian/changelog --- dm-writeboost-2.2.9/debian/changelog 2018-11-07 22:41:49.000000000 +0000 +++ dm-writeboost-2.2.9/debian/changelog 2020-10-13 09:29:19.000000000 +0000 @@ -1,3 +1,11 @@ +dm-writeboost (2.2.9-1ubuntu2) focal; urgency=medium + + * Linux 5.8 compatibility (LP: #1899604): + - debian/patches/0002-fix-missing-stat-header.patch + - debian/patches/0003-Fix-Linux-5.8-build-gc-error-parameter-from-blkdev_i.patch + + -- Andrea Righi Tue, 13 Oct 2020 09:29:19 +0000 + dm-writeboost (2.2.9-1ubuntu1) disco; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru dm-writeboost-2.2.9/debian/patches/0002-fix-missing-stat-header.patch dm-writeboost-2.2.9/debian/patches/0002-fix-missing-stat-header.patch --- dm-writeboost-2.2.9/debian/patches/0002-fix-missing-stat-header.patch 1970-01-01 00:00:00.000000000 +0000 +++ dm-writeboost-2.2.9/debian/patches/0002-fix-missing-stat-header.patch 2020-10-13 09:29:19.000000000 +0000 @@ -0,0 +1,26 @@ +From 358e980fc487e6ff551a44dfed481910aee9dd52 Mon Sep 17 00:00:00 2001 +From: Paolo Pisati +Date: Wed, 13 May 2020 13:10:03 +0000 +Subject: [PATCH] Fix Linux 5.7 build + +commit c6a564ffadc9105880329710164ee493f0de103c "block: move the part_stat* +helpers from genhd.h to a new header" moved part_stat* to a new header, fix the +code accordingly + +Signed-off-by: Paolo Pisati +--- + src/dm-writeboost-daemon.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/src/dm-writeboost-daemon.c ++++ b/src/dm-writeboost-daemon.c +@@ -21,6 +21,9 @@ + #include "dm-writeboost-metadata.h" + #include "dm-writeboost-daemon.h" + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,7,0) ++#include ++#endif + #include + + /*----------------------------------------------------------------------------*/ diff -Nru dm-writeboost-2.2.9/debian/patches/0003-Fix-Linux-5.8-build-gc-error-parameter-from-blkdev_i.patch dm-writeboost-2.2.9/debian/patches/0003-Fix-Linux-5.8-build-gc-error-parameter-from-blkdev_i.patch --- dm-writeboost-2.2.9/debian/patches/0003-Fix-Linux-5.8-build-gc-error-parameter-from-blkdev_i.patch 1970-01-01 00:00:00.000000000 +0000 +++ dm-writeboost-2.2.9/debian/patches/0003-Fix-Linux-5.8-build-gc-error-parameter-from-blkdev_i.patch 2020-10-13 09:29:19.000000000 +0000 @@ -0,0 +1,90 @@ +From 4ef35a7ab4a4c93ee7ce587510b7326e2836aa46 Mon Sep 17 00:00:00 2001 +From: Paolo Pisati +Date: Fri, 3 Jul 2020 10:38:03 +0000 +Subject: [PATCH] Fix Linux 5.8 build: gc error parameter from + blkdev_issue_flush() + +commit 9398554fb3 "block: remove the error_sector argument to +blkdev_issue_flush" removed the unused error parameter from blkdev_issue_flush() +- fix the code accordingly + +Signed-off-by: Paolo Pisati +--- + src/dm-writeboost-daemon.c | 6 +++--- + src/dm-writeboost-metadata.c | 2 +- + src/dm-writeboost-target.c | 2 +- + src/dm-writeboost.h | 6 ++++++ + 4 files changed, 11 insertions(+), 5 deletions(-) + +Index: dm-writeboost-2.2.9/src/dm-writeboost-daemon.c +=================================================================== +--- dm-writeboost-2.2.9.orig/src/dm-writeboost-daemon.c ++++ dm-writeboost-2.2.9/src/dm-writeboost-daemon.c +@@ -62,7 +62,7 @@ static void process_deferred_barriers(st + struct bio *bio; + + /* Make all the preceding data persistent. */ +- int err = blkdev_issue_flush(wb->cache_dev->bdev, GFP_NOIO, NULL); ++ int err = dm_blkdev_issue_flush(wb->cache_dev->bdev, GFP_NOIO); + + /* Ack the chained barrier requests. */ + while ((bio = bio_list_pop(&rambuf->barrier_ios))) +@@ -378,7 +378,7 @@ static bool do_writeback_segs(struct wb_ + if (!try_writeback_segs(wb)) + return false; + +- blkdev_issue_flush(wb->backing_dev->bdev, GFP_NOIO, NULL); ++ dm_blkdev_issue_flush(wb->backing_dev->bdev, GFP_NOIO); + return true; + } + +@@ -578,7 +578,7 @@ int data_synchronizer_proc(void *data) + } + + flush_current_buffer(wb); +- blkdev_issue_flush(wb->cache_dev->bdev, GFP_NOIO, NULL); ++ dm_blkdev_issue_flush(wb->cache_dev->bdev, GFP_NOIO); + schedule_timeout_interruptible(msecs_to_jiffies(intvl)); + } + return 0; +Index: dm-writeboost-2.2.9/src/dm-writeboost-metadata.c +=================================================================== +--- dm-writeboost-2.2.9.orig/src/dm-writeboost-metadata.c ++++ dm-writeboost-2.2.9/src/dm-writeboost-metadata.c +@@ -507,7 +507,7 @@ static int format_all_segment_headers(st + goto bad; + } + +- err = blkdev_issue_flush(dev->bdev, GFP_KERNEL, NULL); ++ err = dm_blkdev_issue_flush(dev->bdev, GFP_KERNEL); + + bad: + mempool_free(buf, wb->buf_8_pool); +Index: dm-writeboost-2.2.9/src/dm-writeboost-target.c +=================================================================== +--- dm-writeboost-2.2.9.orig/src/dm-writeboost-target.c ++++ dm-writeboost-2.2.9/src/dm-writeboost-target.c +@@ -1837,7 +1837,7 @@ static void writeboost_postsuspend(struc + { + struct wb_device *wb = ti->private; + flush_current_buffer(wb); +- blkdev_issue_flush(wb->cache_dev->bdev, GFP_NOIO, NULL); ++ dm_blkdev_issue_flush(wb->cache_dev->bdev, GFP_NOIO); + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(4,17,0) +Index: dm-writeboost-2.2.9/src/dm-writeboost.h +=================================================================== +--- dm-writeboost-2.2.9.orig/src/dm-writeboost.h ++++ dm-writeboost-2.2.9/src/dm-writeboost.h +@@ -528,4 +528,10 @@ sector_t dm_devsize(struct dm_dev *); + + /*----------------------------------------------------------------------------*/ + ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(5,8,0) ++#define dm_blkdev_issue_flush(x, y) blkdev_issue_flush(x, y) ++#else ++#define dm_blkdev_issue_flush(x, y) blkdev_issue_flush(x, y, NULL) ++#endif ++ + #endif diff -Nru dm-writeboost-2.2.9/debian/patches/series dm-writeboost-2.2.9/debian/patches/series --- dm-writeboost-2.2.9/debian/patches/series 2018-11-06 17:20:28.000000000 +0000 +++ dm-writeboost-2.2.9/debian/patches/series 2020-10-13 09:29:19.000000000 +0000 @@ -1,2 +1,4 @@ 0001-Fix-building-for-linux-4.19 0001-Fix-calling-dm_kcopyd_zero-on-linux-4.19 +0002-fix-missing-stat-header.patch +0003-Fix-Linux-5.8-build-gc-error-parameter-from-blkdev_i.patch