]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/blob - releases/4.14.60/block-reset-bi_iter.bi_done-after-splitting-bio.patch
Remove duplicated commits
[thirdparty/kernel/stable-queue.git] / releases / 4.14.60 / block-reset-bi_iter.bi_done-after-splitting-bio.patch
1 From 5151842b9d8732d4cbfa8400b40bff894f501b2f Mon Sep 17 00:00:00 2001
2 From: Greg Edwards <gedwards@ddn.com>
3 Date: Thu, 26 Jul 2018 14:39:37 -0400
4 Subject: block: reset bi_iter.bi_done after splitting bio
5
6 From: Greg Edwards <gedwards@ddn.com>
7
8 commit 5151842b9d8732d4cbfa8400b40bff894f501b2f upstream.
9
10 After the bio has been updated to represent the remaining sectors, reset
11 bi_done so bio_rewind_iter() does not rewind further than it should.
12
13 This resolves a bio_integrity_process() failure on reads where the
14 original request was split.
15
16 Fixes: 63573e359d05 ("bio-integrity: Restore original iterator on verify stage")
17 Signed-off-by: Greg Edwards <gedwards@ddn.com>
18 Signed-off-by: Jens Axboe <axboe@kernel.dk>
19 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
20
21 ---
22 block/bio.c | 1 +
23 1 file changed, 1 insertion(+)
24
25 --- a/block/bio.c
26 +++ b/block/bio.c
27 @@ -1889,6 +1889,7 @@ struct bio *bio_split(struct bio *bio, i
28 bio_integrity_trim(split);
29
30 bio_advance(bio, split->bi_iter.bi_size);
31 + bio->bi_iter.bi_done = 0;
32
33 if (bio_flagged(bio, BIO_TRACE_COMPLETION))
34 bio_set_flag(split, BIO_TRACE_COMPLETION);