From 2856ef4ec10746b6164516fd7da3021904b91bfd Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 19 Jan 2007 12:01:16 +1100 Subject: [PATCH] --- yaml --- r: 47876 b: refs/heads/master c: cb8874119e9a3ec38c45942808c91cfbc014f402 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 3993995efe68..011195e7db76 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1792669cc1acc2069869b7ca41a0195240de05e0 +refs/heads/master: cb8874119e9a3ec38c45942808c91cfbc014f402 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 3df41a00b553..03b1e474b2bf 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -885,16 +885,17 @@ static inline struct request *cfq_check_fifo(struct cfq_queue *cfqq) if (cfq_cfqq_fifo_expire(cfqq)) return NULL; + + cfq_mark_cfqq_fifo_expire(cfqq); + if (list_empty(&cfqq->fifo)) return NULL; fifo = cfq_cfqq_class_sync(cfqq); rq = rq_entry_fifo(cfqq->fifo.next); - if (time_after(jiffies, rq->start_time + cfqd->cfq_fifo_expire[fifo])) { - cfq_mark_cfqq_fifo_expire(cfqq); + if (time_after(jiffies, rq->start_time + cfqd->cfq_fifo_expire[fifo])) return rq; - } return NULL; }