Re: [PATCH] bcache: call bio_endio() to replace directly calling bio->bi_end_io()

Re: [PATCH] bcache: call bio_endio() to replace directly calling bio->bi_end_io()

[Stephen Zhang]

Hi Coly,

For this issue, I've previously sent a fix here:
https://lore.kernel.org/all/20251129090122.2457896-2-zhangshida@kylinos.cn/
Would you be able to take a look and see if that one is suitable to pick up?

Thanks,
Shida

Re: [PATCH] bcache: call bio_endio() to replace directly calling bio->bi_end_io()

[Coly Li]

> 2025年12月1日 10:49，Stephen Zhang <starzhangzsd@gmail.com> 写道：
> 
> Hi Coly,
> 
> For this issue, I've previously sent a fix here:
> https://lore.kernel.org/all/20251129090122.2457896-2-zhangshida@kylinos.cn/
> Would you be able to take a look and see if that one is suitable to pick up?

Hi Shida,

It seems my email server didn’t handle the v3 patch set well. Yes, now I see your patch,
I will reply your in the patch context.

Thanks.

Coly Li

[PATCH] bcache: call bio_endio() to replace directly calling bio->bi_end_io()

[colyli]

From: Coly Li <colyli@fnnas.com>

When a bcache device is not attached to a cache device, current code
calls the request's bi_end_io() callback directly. The correct method is
to call bio_endio(bio) instead of bio->bi_end_io(bio).

This patch fixes the incorrect calling.

Fixes: bc082a55d25c ("bcache: fix inaccurate io state for detached bcache devices")
Fixes: 40f567bbb3b0 ("md: bcache: check the return value of kzalloc() in detached_dev_do_request()")
Reported-by: Shida Zhang <zhangshida@kylinos.cn>
Closes: https://lore.kernel.org/linux-block/20251121081748.1443507-1-zhangshida@kylinos.cn/
Cc: Christoph Hellwig <hch@infradead.org>
Cc: Jia-Ju Bai <baijiaju1990@gmail.com>
Cc: stable@vger.kernel.org #4.17+
Signed-off-by: Coly Li <colyli@fnnas.com>
---
 drivers/md/bcache/request.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/md/bcache/request.c b/drivers/md/bcache/request.c
index af345dc6fde1..7b815064db54 100644
--- a/drivers/md/bcache/request.c
+++ b/drivers/md/bcache/request.c
@@ -1104,7 +1104,7 @@ static void detached_dev_end_io(struct bio *bio)
 	}
 
 	kfree(ddip);
-	bio->bi_end_io(bio);
+	bio_endio(bio);
 }
 
 static void detached_dev_do_request(struct bcache_device *d, struct bio *bio,
@@ -1121,7 +1121,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio,
 	ddip = kzalloc(sizeof(struct detached_dev_io_private), GFP_NOIO);
 	if (!ddip) {
 		bio->bi_status = BLK_STS_RESOURCE;
-		bio->bi_end_io(bio);
+		bio_endio(bio);
 		return;
 	}
 
@@ -1136,7 +1136,7 @@ static void detached_dev_do_request(struct bcache_device *d, struct bio *bio,
 
 	if ((bio_op(bio) == REQ_OP_DISCARD) &&
 	    !bdev_max_discard_sectors(dc->bdev))
-		bio->bi_end_io(bio);
+		bio_endio(bio);
 	else
 		submit_bio_noacct(bio);
 }
-- 
2.47.3