diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index b2fd8cac2147..5e4bae7f4158 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -42,7 +42,6 @@ static DEFINE_SPINLOCK(cfq_exit_lock); | |||
42 | #define list_entry_qhash(entry) hlist_entry((entry), struct cfq_queue, cfq_hash) | 42 | #define list_entry_qhash(entry) hlist_entry((entry), struct cfq_queue, cfq_hash) |
43 | 43 | ||
44 | #define list_entry_cfqq(ptr) list_entry((ptr), struct cfq_queue, cfq_list) | 44 | #define list_entry_cfqq(ptr) list_entry((ptr), struct cfq_queue, cfq_list) |
45 | #define list_entry_fifo(ptr) list_entry((ptr), struct request, queuelist) | ||
46 | 45 | ||
47 | #define RQ_DATA(rq) (rq)->elevator_private | 46 | #define RQ_DATA(rq) (rq)->elevator_private |
48 | 47 | ||
@@ -840,7 +839,7 @@ static inline struct cfq_rq *cfq_check_fifo(struct cfq_queue *cfqq) | |||
840 | if (!list_empty(&cfqq->fifo)) { | 839 | if (!list_empty(&cfqq->fifo)) { |
841 | int fifo = cfq_cfqq_class_sync(cfqq); | 840 | int fifo = cfq_cfqq_class_sync(cfqq); |
842 | 841 | ||
843 | crq = RQ_DATA(list_entry_fifo(cfqq->fifo.next)); | 842 | crq = RQ_DATA(rq_entry_fifo(cfqq->fifo.next)); |
844 | rq = crq->request; | 843 | rq = crq->request; |
845 | if (time_after(jiffies, rq->start_time + cfqd->cfq_fifo_expire[fifo])) { | 844 | if (time_after(jiffies, rq->start_time + cfqd->cfq_fifo_expire[fifo])) { |
846 | cfq_mark_cfqq_fifo_expire(cfqq); | 845 | cfq_mark_cfqq_fifo_expire(cfqq); |