github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-07 14:04:54 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

This is the 5.10.1 stable release

Browse Source 
-----BEGIN PGP SIGNATURE-----
 
 iQIzBAABCAAdFiEEZH8oZUiU471FcZm+ONu9yGCSaT4FAl/Xr+oACgkQONu9yGCS
 aT7kiA//aqCOtFgnpnLdFBWuW0/tnJbClAj26mbabebIGLVazNZtRNZD/eoPzhw5
 /E+3CrLI76E+HMrN/Sk6ULSyPd8efwLtZOQWx5U+VNTx9UcprFsSgahMszBbZymw
 NhkhKqm3b2xDtpHbR09qxH3odN7ilPcX3gWxWfy1ks6hQD6/7iydedRJesnRcV7j
 NznU2ZpQg6gnrah6eVjTjHTV8mlG2h3p4Qn3ml+xAbT+F4N7CmDhJFhj8oK5N+ia
 XElRiUCLkW73O8g5stY8gV9H9Glj1YMGHwChmd9V+gpLtgHdvuI9xtqpoJfuYCXk
 wQfgkLwNfbX4KgA9378Wdc1y3lWIHcMoUMY1Sovx4jq7k9iTrkAEQ+ITJ7eWVpqR
 IV9UWw3dWkAyD2rWXZqmY6NZHNGPToUQBKugNUNDoWVLWJaz501DIzVnlpgkUGQ9
 t2R1o/mc2aUs4EyQNVKm/OAVB0UiDtu1DQTfIxTmRFLtrx2M2ngZjRI1c75+9M0/
 VWQuqAvktr0ZqdD/dhbr2aUTsOCAgU5ctKr62Nwf+R2ZWmGZRHOvomGdoVDLa17U
 37dNWuHd4GLixNFB05f9lj2rK+ocbsM0k6DJQSfhuC2QjyMS6krTG6e60pmWfga4
 LuK1y2RJ4sMHy6OSE5ksUUgVqLGNKL0cllEk6a2wZ/2FkgC4GLY=
 =AB8z
 -----END PGP SIGNATURE-----

Merge 5.10.1 into android-5.10

Changes in 5.10.1
	Revert "md: change mddev 'chunk_sectors' from int to unsigned"
	Revert "dm raid: fix discard limits for raid1 and raid10"
	Linux 5.10.1

Signed-off-by: Greg Kroah-Hartman <gregkh@google.com>
Change-Id: Ifa253f67e0b25ec9a2afa77d5be98b77bc61b6a5
This commit is contained in:
Greg Kroah-Hartman 2020-12-14 20:45:51 +01:00
commit a54c7055d9
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,7 +1,7 @@
# SPDX-License-Identifier: GPL-2.0
VERSION = 5
PATCHLEVEL = 10
SUBLEVEL = 0
SUBLEVEL = 1
EXTRAVERSION =
NAME = Kleptomaniac Octopus

12
drivers/md/dm-raid.c
View File

@ -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;
}
}

4
drivers/md/md.h
View File

@ -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 */