summaryrefslogtreecommitdiff
path: root/block
diff options
context:
space:
mode:
authorJens Axboe <axboe@suse.de>2006-07-11 21:30:31 +0200
committerJens Axboe <axboe@nelson.home.kernel.dk>2006-09-30 20:26:59 +0200
commit95e8810b283cfac50789126de4207f9909299de9 (patch)
tree5fc74242c9cc3e2a753f7b7e54fd08a3653f65bd /block
parent1fbfdfcddff4df188b24d9d05271a76a85064583 (diff)
downloadlinux-3.10-95e8810b283cfac50789126de4207f9909299de9.tar.gz
linux-3.10-95e8810b283cfac50789126de4207f9909299de9.tar.bz2
linux-3.10-95e8810b283cfac50789126de4207f9909299de9.zip
[PATCH] cfq-iosched: convert to using the FIFO elevator defines
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'block')
-rw-r--r--block/cfq-iosched.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c
index b2fd8cac214..5e4bae7f415 100644
--- 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);