bcache: fix I/O accounting leak in detached_dev_do_request

When a bcache device is detached, discard requests are completed
immediately. However, the I/O accounting started in
cached_dev_make_request() is not ended, leading to 100% disk
utilization reports in iostat. Add the missing bio_end_io_acct() call.

Fixes: cafe56359144 ("bcache: A block layer cache")
Signed-off-by: Shida Zhang <zhangshida@kylinos.cn>
Acked-by: Coly Li <colyli@fnnas.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Jens Axboe <axboe@kernel.dk>

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index c2f38907a2a34af3f18862910a4613753fb641c4..3fa3b13a410f422ff62cc87048c05c7ec4d8ba14 100644 (file)
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -1107,6 +1107,7 @@ static void detached_dev_do_request(struct bcache_device *d,
 
        if (bio_op(orig_bio) == REQ_OP_DISCARD &&
            !bdev_max_discard_sectors(dc->bdev)) {
+               bio_end_io_acct(orig_bio, start_time);
                bio_endio(orig_bio);
                return;
        }