diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index 552624bbec91..e5348cebf12d 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -5794,8 +5794,7 @@ static void make_discard_request(struct mddev *mddev, struct bio *bi)
 	int stripe_sectors;
 
 	if (mddev->reshape_position != MaxSector)
-		/* Skip discard while reshape is happening */
-		return;
+		goto complete_again;
 
 	if (!raid5_discard_limits(mddev, bi))
 		return;
@@ -5882,6 +5881,11 @@ static void make_discard_request(struct mddev *mddev, struct bio *bi)
 	}
 
 	bio_endio(bi);
+	return;
+
+complete_again:
+	/* Skip discard while reshape is happening */
+	bio_endio_status(bi, BLK_STS_AGAIN);
 }
 
 static bool ahead_of_reshape(struct mddev *mddev, sector_t sector,