From b6d3b3aab0c2f27c2e8b946071144a4595f2bbe7 Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 16 Jun 2006 15:35:39 +0200 Subject: [PATCH] --- yaml --- r: 29199 b: refs/heads/master c: fd61af0384014ca29428ace7c17a978b755aeddd h: refs/heads/master i: 29197: eb48b0c657a58244a746ed624637b5d02f647672 29195: dc4c0e9fda04a3ea4f781271cf565114349d0529 29191: e773020f03abbc8ffecc1efb2543786f940bcde3 29183: abd228295c198bf53d6215ade6d8ea92636507c5 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index dedfe5f131fd..711945c226af 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: caaa5f9f0a75d1dc5e812e69afdbb8720e077fd3 +refs/heads/master: fd61af0384014ca29428ace7c17a978b755aeddd diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 13c4793fdf5f..940364edf2b9 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -952,11 +952,15 @@ static void cfq_dispatch_insert(request_queue_t *q, struct cfq_rq *crq) { struct cfq_data *cfqd = q->elevator->elevator_data; struct cfq_queue *cfqq = crq->cfq_queue; + struct request *rq; cfqq->next_crq = cfq_find_next_crq(cfqd, cfqq, crq); cfq_remove_request(crq->request); cfqq->on_dispatch[cfq_crq_is_sync(crq)]++; elv_dispatch_sort(q, crq->request); + + rq = list_entry(q->queue_head.prev, struct request, queuelist); + cfqd->last_sector = rq->sector + rq->nr_sectors; } /* @@ -1767,11 +1771,7 @@ static void cfq_crq_enqueued(struct cfq_data *cfqd, struct cfq_queue *cfqq, struct cfq_rq *crq) { - struct cfq_io_context *cic; - - cfqq->next_crq = cfq_choose_req(cfqd, cfqq->next_crq, crq); - - cic = crq->io_context; + struct cfq_io_context *cic = crq->io_context; /* * we never wait for an async request and we don't allow preemption