Merge tag 'for-5.11/revert-problem-v5.10-raid-changes' of git://git.kernel.org/pub...

[linux-2.6-microblaze.git] / drivers / md / md.c

diff --git a/drivers/md/md.c b/drivers/md/md.c
index 98bac4f..0037c6e 100644 (file)
--- a/drivers/md/md.c
+++ b/drivers/md/md.c
@@ -8582,26 +8582,6 @@ void md_write_end(struct mddev *mddev)
 
 EXPORT_SYMBOL(md_write_end);
 
-/* This is used by raid0 and raid10 */
-void md_submit_discard_bio(struct mddev *mddev, struct md_rdev *rdev,
-                       struct bio *bio, sector_t start, sector_t size)
-{
-       struct bio *discard_bio = NULL;
-
-       if (__blkdev_issue_discard(rdev->bdev, start, size,
-               GFP_NOIO, 0, &discard_bio) || !discard_bio)
-               return;
-
-       bio_chain(discard_bio, bio);
-       bio_clone_blkg_association(discard_bio, bio);
-       if (mddev->gendisk)
-               trace_block_bio_remap(bdev_get_queue(rdev->bdev),
-                       discard_bio, disk_devt(mddev->gendisk),
-                       bio->bi_iter.bi_sector);
-       submit_bio_noacct(discard_bio);
-}
-EXPORT_SYMBOL(md_submit_discard_bio);
-
 /* md_allow_write(mddev)
  * Calling this ensures that the array is marked 'active' so that writes
  * may proceed without blocking.  It is important to call this before