aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/blkdev.h
diff options
context:
space:
mode:
authorTejun Heo <htejun@gmail.com>2005-10-20 10:46:23 -0400
committerJens Axboe <axboe@nelson.home.kernel.dk>2005-10-28 02:45:20 -0400
commit06b86245c052963029bfd9020ca1f08ceb66f85a (patch)
tree1bd2675aceca74398f5fcf148f6cf2f551d63b52 /include/linux/blkdev.h
parentb4878f245ec8e168cdd1f170f823a750b7dd4af5 (diff)
[PATCH] 03/05 move last_merge handlin into generic elevator code
Currently, both generic elevator code and specific ioscheds participate in the management and usage of last_merge. This and the following patches move last_merge handling into generic elevator code. Signed-off-by: Tejun Heo <htejun@gmail.com> Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r--include/linux/blkdev.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a2e496f285a4..bd55b1df8997 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -630,6 +630,9 @@ static inline void blkdev_dequeue_request(struct request *req)
630static inline void elv_dispatch_add_tail(struct request_queue *q, 630static inline void elv_dispatch_add_tail(struct request_queue *q,
631 struct request *rq) 631 struct request *rq)
632{ 632{
633 if (q->last_merge == rq)
634 q->last_merge = NULL;
635
633 q->end_sector = rq_end_sector(rq); 636 q->end_sector = rq_end_sector(rq);
634 q->boundary_rq = rq; 637 q->boundary_rq = rq;
635 list_add_tail(&rq->queuelist, &q->queue_head); 638 list_add_tail(&rq->queuelist, &q->queue_head);