Commit 0cfbcafc authored by Shaohua Li's avatar Shaohua Li Committed by Jens Axboe

block: add plug for blkdev_issue_discard

Last post of this patch appears lost, so I resend this.

Now discard merge works, add plug for blkdev_issue_discard. This will help
discard request merge especially for raid0 case. In raid0, a big discard
request is split to small requests, and if correct plug is added, such small
requests can be merged in low layer.
Signed-off-by: default avatarShaohua Li <shli@fusionio.com>
Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 8dd2cb7e
...@@ -48,6 +48,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, ...@@ -48,6 +48,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
struct bio_batch bb; struct bio_batch bb;
struct bio *bio; struct bio *bio;
int ret = 0; int ret = 0;
struct blk_plug plug;
if (!q) if (!q)
return -ENXIO; return -ENXIO;
...@@ -82,6 +83,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, ...@@ -82,6 +83,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
bb.flags = 1 << BIO_UPTODATE; bb.flags = 1 << BIO_UPTODATE;
bb.wait = &wait; bb.wait = &wait;
blk_start_plug(&plug);
while (nr_sects) { while (nr_sects) {
unsigned int req_sects; unsigned int req_sects;
sector_t end_sect, tmp; sector_t end_sect, tmp;
...@@ -120,6 +122,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector, ...@@ -120,6 +122,7 @@ int blkdev_issue_discard(struct block_device *bdev, sector_t sector,
atomic_inc(&bb.done); atomic_inc(&bb.done);
submit_bio(type, bio); submit_bio(type, bio);
} }
blk_finish_plug(&plug);
/* Wait for bios in-flight */ /* Wait for bios in-flight */
if (!atomic_dec_and_test(&bb.done)) if (!atomic_dec_and_test(&bb.done))
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment