commit: 312231d0bf248ef093c70ce79db3b5b1ce1b29df Author: Mike Pagano <mpagano <AT> gentoo <DOT> org> AuthorDate: Mon Dec 14 20:45:42 2020 +0000 Commit: Mike Pagano <mpagano <AT> gentoo <DOT> org> CommitDate: Mon Dec 14 20:45:42 2020 +0000 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=312231d0
Linux patch 5.10.1 Signed-off-by: Mike Pagano <mpagano <AT> gentoo.org> 0000_README | 4 ++++ 1001_linux-5.10.1.patch | 59 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 63 insertions(+) diff --git a/0000_README b/0000_README index c2ae47f..414f5d7 100644 --- a/0000_README +++ b/0000_README @@ -43,6 +43,10 @@ EXPERIMENTAL Individual Patch Descriptions: -------------------------------------------------------------------------- +Patch: 1000_linux-5.10.1.patch +From: http://www.kernel.org +Desc: Linux 5.10.1 + Patch: 1500_XATTR_USER_PREFIX.patch From: https://bugs.gentoo.org/show_bug.cgi?id=470644 Desc: Support for namespace user.pax.* on tmpfs. diff --git a/1001_linux-5.10.1.patch b/1001_linux-5.10.1.patch new file mode 100644 index 0000000..1aefc35 --- /dev/null +++ b/1001_linux-5.10.1.patch @@ -0,0 +1,59 @@ +diff --git a/Makefile b/Makefile +index e30cf02da8b89..076d4e6b9ccc2 100644 +--- a/Makefile ++++ b/Makefile +@@ -1,7 +1,7 @@ + # SPDX-License-Identifier: GPL-2.0 + VERSION = 5 + PATCHLEVEL = 10 +-SUBLEVEL = 0 ++SUBLEVEL = 1 + EXTRAVERSION = + NAME = Kleptomaniac Octopus + +diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c +index dc8568ab96f24..56b723d012ac1 100644 +--- a/drivers/md/dm-raid.c ++++ b/drivers/md/dm-raid.c +@@ -3730,14 +3730,12 @@ static void raid_io_hints(struct dm_target *ti, struct queue_limits *limits) + blk_limits_io_opt(limits, chunk_size_bytes * mddev_data_stripes(rs)); + + /* +- * RAID10 personality requires bio splitting, +- * RAID0/1/4/5/6 don't and process large discard bios properly. ++ * RAID1 and RAID10 personalities require bio splitting, ++ * RAID0/4/5/6 don't and process large discard bios properly. + */ +- if (rs_is_raid10(rs)) { +- limits->discard_granularity = max(chunk_size_bytes, +- limits->discard_granularity); +- limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors, +- limits->max_discard_sectors); ++ if (rs_is_raid1(rs) || rs_is_raid10(rs)) { ++ limits->discard_granularity = chunk_size_bytes; ++ limits->max_discard_sectors = rs->md.chunk_sectors; + } + } + +diff --git a/drivers/md/md.h b/drivers/md/md.h +index bb645bc3ba6d6..2175a5ac4f7c6 100644 +--- a/drivers/md/md.h ++++ b/drivers/md/md.h +@@ -311,7 +311,7 @@ struct mddev { + int external; /* metadata is + * managed externally */ + char metadata_type[17]; /* externally set*/ +- unsigned int chunk_sectors; ++ int chunk_sectors; + time64_t ctime, utime; + int level, layout; + char clevel[16]; +@@ -339,7 +339,7 @@ struct mddev { + */ + sector_t reshape_position; + int delta_disks, new_level, new_layout; +- unsigned int new_chunk_sectors; ++ int new_chunk_sectors; + int reshape_backwards; + + struct md_thread *thread; /* management thread */
