mirror of
https://github.com/BobTheBlinker/android_kernel_motorola_sm6375.git
synced 2026-10-29 11:11:45 -04:00
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 <[email protected]> Cc: Rusty Russell <[email protected]> Cc: Jeremy Fitzhardinge <[email protected]> Cc: Stephen Rothwell <[email protected]> Cc: Alex Dubov <[email protected]> Cc: Markus Lidel <[email protected]> Cc: Pierre Ossman <[email protected]> Signed-off-by: Jens Axboe <[email protected]>
This commit is contained in:
parent
fb3ac7f6b8
commit
296b2f6ae6
7 changed files with 36 additions and 18 deletions
|
|
@ -672,8 +672,7 @@ try_again:
|
|||
msb->req_sg);
|
||||
|
||||
if (!msb->seg_count) {
|
||||
chunk = __blk_end_request(msb->block_req, -ENOMEM,
|
||||
blk_rq_cur_bytes(msb->block_req));
|
||||
chunk = __blk_end_request_cur(msb->block_req, -ENOMEM);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
|
@ -711,6 +710,7 @@ try_again:
|
|||
dev_dbg(&card->dev, "issue end\n");
|
||||
return -EAGAIN;
|
||||
}
|
||||
blkdev_dequeue_request(msb->block_req);
|
||||
|
||||
dev_dbg(&card->dev, "trying again\n");
|
||||
chunk = 1;
|
||||
|
|
@ -825,8 +825,10 @@ static void mspro_block_submit_req(struct request_queue *q)
|
|||
return;
|
||||
|
||||
if (msb->eject) {
|
||||
while ((req = elv_next_request(q)) != NULL)
|
||||
while ((req = elv_next_request(q)) != NULL) {
|
||||
blkdev_dequeue_request(req);
|
||||
__blk_end_request_all(req, -ENODEV);
|
||||
}
|
||||
|
||||
return;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue