Revert "dm raid: fix discard limits for raid1 and raid10"

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

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index 6f44177..35843df 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -477,6 +477,7 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
 
        for (disk = 0; disk < zone->nb_dev; disk++) {
                sector_t dev_start, dev_end;
+               struct bio *discard_bio = NULL;
                struct md_rdev *rdev;
 
                if (disk < start_disk_index)
@@ -499,9 +500,18 @@ static void raid0_handle_discard(struct mddev *mddev, struct bio *bio)
 
                rdev = conf->devlist[(zone - conf->strip_zone) *
                        conf->strip_zone[0].nb_dev + disk];
-               md_submit_discard_bio(mddev, rdev, bio,
+               if (__blkdev_issue_discard(rdev->bdev,
                        dev_start + zone->dev_start + rdev->data_offset,
-                       dev_end - dev_start);
+                       dev_end - dev_start, GFP_NOIO, 0, &discard_bio) ||
+                   !discard_bio)
+                       continue;
+               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);
        }
        bio_endio(bio);
 }