From b40503ea4f5c134b16ef405cab6c08f9343a0d06 Mon Sep 17 00:00:00 2001

From: Zhai Zhaoxuan <kxuanobj@gmail.com>

Date: Mon, 8 Jan 2018 12:21:27 -0800

Subject: [PATCH] bcache: fix unmatched generic_end_io_acct() &

 generic_start_io_acct()

Git-commit: b40503ea4f5c134b16ef405cab6c08f9343a0d06

Patch-mainline: v4.16-rc1

References: bsc#1093023

The function cached_dev_make_request() and flash_dev_make_request() call

generic_start_io_acct() with (struct bcache_device)->disk when they start a

closure. Then the function bio_complete() calls generic_end_io_acct() with

(struct search)->orig_bio->bi_disk when the closure has done.

Since the `bi_disk` is not the bcache device, the generic_end_io_acct() is

called with a wrong device queue.

It causes the "inflight" (in struct hd_struct) counter keep increasing

without decreasing.

This patch fix the problem by calling generic_end_io_acct() with

(struct bcache_device)->disk.

Signed-off-by: Zhai Zhaoxuan <kxuanobj@gmail.com>

Reviewed-by: Michael Lyle <mlyle@lyle.org>

Reviewed-by: Coly Li <colyli@suse.de>

Reviewed-by: Tang Junhui <tang.junhui@zte.com.cn>

Signed-off-by: Jens Axboe <axboe@kernel.dk>

Signed-off-by: Coly Li <colyli@suse.de>

---

 drivers/md/bcache/request.c | 4 ++--

 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c

index ddd941056f3c..1a46b41dac70 100644

--- a/drivers/md/bcache/request.c

+++ b/drivers/md/bcache/request.c

@@ -633,8 +633,8 @@ static void request_endio(struct bio *bio)

 static void bio_complete(struct search *s)

 {

 	if (s->orig_bio) {

-		struct request_queue *q = s->orig_bio->bi_disk->queue;

-		generic_end_io_acct(q, bio_data_dir(s->orig_bio),

+		generic_end_io_acct(s->d->disk->queue,

+				    bio_data_dir(s->orig_bio),

 				    &s->d->disk->part0, s->start_time);

 		trace_bcache_request_end(s->d, s->orig_bio);

-- 

2.16.3