From 9e5e30aa0f8fbb7a5858b855fece4a79b8f03fe2 Mon Sep 17 00:00:00 2001 From: Sahitya Tummala Date: Mon, 21 Dec 2020 08:51:59 +0530 Subject: [PATCH] block: Fix the setting of same_page variable The same_page variable inside the function __bio_try_merge_page() must be set to true if the merge happened within the same page. As some the callers of this function take action based on that. Change-Id: Iae4a7170aeaffcc0b9c424368c7d8127d51a177b Fixes: 1bbb4bd9c36f ("block: disable multi-page bvec") Signed-off-by: Sahitya Tummala --- block/bio.c | 1 + 1 file changed, 1 insertion(+) diff --git a/block/bio.c b/block/bio.c index 2a5e97f463ca..608a62f0b0ad 100644 --- a/block/bio.c +++ b/block/bio.c @@ -807,6 +807,7 @@ bool __bio_try_merge_page(struct bio *bio, struct page *page, struct bio_vec *bv = &bio->bi_io_vec[bio->bi_vcnt - 1]; if (page == bv->bv_page && off == bv->bv_offset + bv->bv_len) { + *same_page = true; bv->bv_len += len; bio->bi_iter.bi_size += len; return true;