[PATCH] 03/05 move last_merge handlin into generic elevator code

[karo-tx-linux.git] / include / linux / blkdev.h

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index a2e496f285a4f257d430f1634d5623d1f5706f5a..bd55b1df8997f732f195eaa763eb46a4867570cc 100644 (file)
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -630,6 +630,9 @@ static inline void blkdev_dequeue_request(struct request *req)
 static inline void elv_dispatch_add_tail(struct request_queue *q,
                                         struct request *rq)
 {
+       if (q->last_merge == rq)
+               q->last_merge = NULL;
+
        q->end_sector = rq_end_sector(rq);
        q->boundary_rq = rq;
        list_add_tail(&rq->queuelist, &q->queue_head);