From 35712b43a264faf512336c7bbf74c78273358347 Mon Sep 17 00:00:00 2001 From: Salvatore Bonaccorso Date: Mon, 5 May 2025 17:01:14 +0200 Subject: [PATCH] Revert "md/raid10: fix missing discard IO accounting" This reverts commit 4a05f7ae33716d996c5ce56478a36a3ede1d76f2. Applying the commit to 6.1.y series is causing regressions for users on discard/TRIM through RAID10. Signed-off-by: Salvatore Bonaccorso --- drivers/md/raid10.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 24427eddf61b..f608f30c7d6a 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -1772,7 +1772,6 @@ static int raid10_handle_discard(struct mddev *mddev, struct bio *bio) * The discard bio returns only first r10bio finishes */ if (first_copy) { - md_account_bio(mddev, &bio); r10_bio->master_bio = bio; set_bit(R10BIO_Discard, &r10_bio->state); first_copy = false; -- 2.49.0