md: add md_submit_discard_bio() for submitting discard bio

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

diff --git a/drivers/md/raid0.c b/drivers/md/raid0.c
index f54a449..e2de0cc 100644 (file)
--- a/drivers/md/raid0.c
+++ b/drivers/md/raid0.c
@@ -410,22 +410,6 @@ static int raid0_run(struct mddev *mddev)
                 mdname(mddev),
                 (unsigned long long)mddev->array_sectors);
 
-       if (mddev->queue) {
-               /* calculate the max read-ahead size.
-                * For read-ahead of large files to be effective, we need to
-                * readahead at least twice a whole stripe. i.e. number of devices
-                * multiplied by chunk size times 2.
-                * If an individual device has an ra_pages greater than the
-                * chunk size, then we will not drive that device as hard as it
-                * wants.  We consider this a configuration error: a larger
-                * chunksize should be used in that case.
-                */
-               int stripe = mddev->raid_disks *
-                       (mddev->chunk_sectors << 9) / PAGE_SIZE;
-               if (mddev->queue->backing_dev_info->ra_pages < 2* stripe)
-                       mddev->queue->backing_dev_info->ra_pages = 2* stripe;
-       }
-
        dump_zones(mddev);
 
        ret = md_integrity_register(mddev);
@@ -510,7 +494,6 @@ 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)
@@ -533,18 +516,9 @@ 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];
-               if (__blkdev_issue_discard(rdev->bdev,
+               md_submit_discard_bio(mddev, rdev, bio,
                        dev_start + zone->dev_start + rdev->data_offset,
-                       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);
+                       dev_end - dev_start);
        }
        bio_endio(bio);
 }