Commit 83df3a75 authored by Philip Müller's avatar Philip Müller

[patch] try to fix lvm-luks issue

parent 8446f06d
In 61697a6abd24 __send_changing_extent_only() was simplified as splitting
discards is no longer necessary. However, we still need to obey
max_io_len_target_boundary.
Signed-off-by: Michael Lass <bevan bi-co net>
---
drivers/md/dm.c | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 1fb1333fefec..997385c1ca54 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1469,7 +1469,7 @@ static unsigned get_num_write_zeroes_bios(struct dm_target *ti)
static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *ti,
unsigned num_bios)
{
- unsigned len = ci->sector_count;
+ unsigned len;
/*
* Even though the device advertised support for this type of
@@ -1480,6 +1480,8 @@ static int __send_changing_extent_only(struct clone_info *ci, struct dm_target *
if (!num_bios)
return -EOPNOTSUPP;
+ len = min((sector_t)ci->sector_count, max_io_len_target_boundary(ci->sector, ti));
+
__send_duplicate_bios(ci, ti, num_bios, &len);
ci->sector += len;
--
2.21.0
......@@ -13,7 +13,7 @@ _basever=51
_aufs=20181217
_bfq=v9
_bfqdate=20181212
_sub=3
_sub=4
pkgver=${_basekernel}.${_sub}
pkgrel=1
arch=('i686' 'x86_64')
......@@ -41,6 +41,7 @@ source=("https://www.kernel.org/pub/linux/kernel/v5.x/linux-${_basekernel}.tar.x
# ARCH Patches
0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
# MANJARO Patches
0001-dm-make-sure-to-obey-max_io_len_target_boundary.patch
# Bootsplash
'0001-bootsplash.patch'
'0002-bootsplash.patch'
......@@ -90,6 +91,9 @@ prepare() {
# disable USER_NS for non-root users by default
patch -Np1 -i ../0001-add-sysctl-to-disallow-unprivileged-CLONE_NEWUSER-by.patch
# https://forum.manjaro.org/t/88360
patch -Np1 -i ../0001-dm-make-sure-to-obey-max_io_len_target_boundary.patch
# Add bootsplash - http://lkml.iu.edu/hypermail/linux/kernel/1710.3/01542.html
patch -Np1 -i "${srcdir}/0001-bootsplash.patch"
patch -Np1 -i "${srcdir}/0002-bootsplash.patch"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment