diff options
| author | Tejun Heo <tj@kernel.org> | 2009-05-08 11:54:15 +0900 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2009-05-11 09:52:17 +0200 |
| commit | 296b2f6ae654581adc27f0d6f0af454c7f3d06ee (patch) | |
| tree | 8fab2b91741336d41e559a839b547d7ac3090524 /drivers/cdrom | |
| parent | fb3ac7f6b811eac8e0aafa3df1c16ed872e898a8 (diff) | |
| download | blackbird-op-linux-296b2f6ae654581adc27f0d6f0af454c7f3d06ee.tar.gz blackbird-op-linux-296b2f6ae654581adc27f0d6f0af454c7f3d06ee.zip | |
block: convert to dequeueing model (easy ones)
plat-omap/mailbox, floppy, viocd, mspro_block, i2o_block and
mmc/card/queue are already pretty close to dequeueing model and can be
converted with simple changes. Convert them.
While at it,
* xen-blkfront: !fs check moved downwards to share dequeue call with
normal path.
* mspro_block: __blk_end_request(..., blk_rq_cur_byte()) converted to
__blk_end_request_cur()
* mmc/card/queue: loop of __blk_end_request() converted to
__blk_end_request_all()
[ Impact: dequeue in-flight request ]
Signed-off-by: Tejun Heo <tj@kernel.org>
Cc: Rusty Russell <rusty@rustcorp.com.au>
Cc: Jeremy Fitzhardinge <jeremy@xensource.com>
Cc: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Alex Dubov <oakad@yahoo.com>
Cc: Markus Lidel <Markus.Lidel@shadowconnect.com>
Cc: Pierre Ossman <drzeus@drzeus.cx>
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/cdrom')
| -rw-r--r-- | drivers/cdrom/viocd.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/cdrom/viocd.c b/drivers/cdrom/viocd.c index 6e190a93d8df..bbe9f0867347 100644 --- a/drivers/cdrom/viocd.c +++ b/drivers/cdrom/viocd.c @@ -298,6 +298,8 @@ static void do_viocd_request(struct request_queue *q) struct request *req; while ((rwreq == 0) && ((req = elv_next_request(q)) != NULL)) { + blkdev_dequeue_request(req); + if (!blk_fs_request(req)) __blk_end_request_all(req, -EIO); else if (send_request(req) < 0) { |
