Gentoo Archives: gentoo-commits

From: Alice Ferrazzi <alicef@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/linux-patches:4.14 commit in: /
Date: Fri, 24 Nov 2017 09:18:55
Message-Id: 1511514763.9d03ff956fd53710893f6f03582f110bef320b78.alicef@gentoo
1 commit: 9d03ff956fd53710893f6f03582f110bef320b78
2 Author: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
3 AuthorDate: Fri Nov 24 09:12:43 2017 +0000
4 Commit: Alice Ferrazzi <alicef <AT> gentoo <DOT> org>
5 CommitDate: Fri Nov 24 09:12:43 2017 +0000
6 URL: https://gitweb.gentoo.org/proj/linux-patches.git/commit/?id=9d03ff95
7
8 remove upstream patch
9
10 ..._bcache-data-corruption-fix-for-bi-partno.patch | 38 ----------------------
11 1 file changed, 38 deletions(-)
12
13 diff --git a/2100_bcache-data-corruption-fix-for-bi-partno.patch b/2100_bcache-data-corruption-fix-for-bi-partno.patch
14 deleted file mode 100644
15 index dd4aed6..0000000
16 --- a/2100_bcache-data-corruption-fix-for-bi-partno.patch
17 +++ /dev/null
18 @@ -1,38 +0,0 @@
19 -From 62530ed8b1d07a45dec94d46e521c0c6c2d476e6 Mon Sep 17 00:00:00 2001
20 -From: Michael Lyle <mlyle@××××.org>
21 -Date: Thu, 16 Nov 2017 23:47:25 -0800
22 -Subject: bio: ensure __bio_clone_fast copies bi_partno
23 -
24 -A new field was introduced in 74d46992e0d9, bi_partno, instead of using
25 -bdev->bd_contains and encoding the partition information in the bi_bdev
26 -field. __bio_clone_fast was changed to copy the disk information, but
27 -not the partition information. At minimum, this regressed bcache and
28 -caused data corruption.
29 -
30 -Signed-off-by: Michael Lyle <mlyle@××××.org>
31 -Fixes: 74d46992e0d9 ("block: replace bi_bdev with a gendisk pointer and partitions index")
32 -Reported-by: Pavel Goran <via-bcache@×××××××.name>
33 -Reported-by: Campbell Steven <casteven@×××××.com>
34 -Reviewed-by: Coly Li <colyli@××××.de>
35 -Reviewed-by: Ming Lei <ming.lei@××××××.com>
36 -Cc: <stable@×××××××××××.org> # 4.14
37 -Signed-off-by: Jens Axboe <axboe@××××××.dk>
38 ----
39 - block/bio.c | 1 +
40 - 1 file changed, 1 insertion(+)
41 -
42 -diff --git a/block/bio.c b/block/bio.c
43 -index b94a802..459cc85 100644
44 ---- a/block/bio.c
45 -+++ b/block/bio.c
46 -@@ -597,6 +597,7 @@ void __bio_clone_fast(struct bio *bio, struct bio *bio_src)
47 - * so we don't set nor calculate new physical/hw segment counts here
48 - */
49 - bio->bi_disk = bio_src->bi_disk;
50 -+ bio->bi_partno = bio_src->bi_partno;
51 - bio_set_flag(bio, BIO_CLONED);
52 - bio->bi_opf = bio_src->bi_opf;
53 - bio->bi_write_hint = bio_src->bi_write_hint;
54 ---
55 -cgit v1.1
56 -