[PATCH] cfq-iosched: convert to using the FIFO elevator defines

Signed-off-by: Jens Axboe <axboe@suse.de>

diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index b2fd8cac2147ef6c9df249853c50025a32259f99..5e4bae7f41587e6380708c3762acb8ede84584ba 100644 (file)
--- a/block/cfq-iosched.c
+++ b/block/cfq-iosched.c
@@ -42,7 +42,6 @@ static DEFINE_SPINLOCK(cfq_exit_lock);
 #define list_entry_qhash(entry)        hlist_entry((entry), struct cfq_queue, cfq_hash)
 
 #define list_entry_cfqq(ptr)   list_entry((ptr), struct cfq_queue, cfq_list)
-#define list_entry_fifo(ptr)   list_entry((ptr), struct request, queuelist)
 
 #define RQ_DATA(rq)            (rq)->elevator_private
 
@@ -840,7 +839,7 @@ static inline struct cfq_rq *cfq_check_fifo(struct cfq_queue *cfqq)
        if (!list_empty(&cfqq->fifo)) {
                int fifo = cfq_cfqq_class_sync(cfqq);
 
-               crq = RQ_DATA(list_entry_fifo(cfqq->fifo.next));
+               crq = RQ_DATA(rq_entry_fifo(cfqq->fifo.next));
                rq = crq->request;
                if (time_after(jiffies, rq->start_time + cfqd->cfq_fifo_expire[fifo])) {
                        cfq_mark_cfqq_fifo_expire(cfqq);