From 1019d32ad0b1d2d0cd28ffee7ad57f4ff5baa06a Mon Sep 17 00:00:00 2001 From: Jens Axboe Date: Fri, 19 Jan 2007 11:59:30 +1100 Subject: [PATCH] --- yaml --- r: 47875 b: refs/heads/master c: 1792669cc1acc2069869b7ca41a0195240de05e0 h: refs/heads/master i: 47873: e9a5943e8f212b9d8acb3e3351fb7232a9635614 47871: 2b28476ccc00a59a6f8dc671e9c0f845d0fe8c94 v: v3 --- [refs] | 2 +- trunk/block/cfq-iosched.c | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 35abdec3559c..3993995efe68 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c5b680f3b7593f2b066c683df799d19f807fb23d +refs/heads/master: 1792669cc1acc2069869b7ca41a0195240de05e0 diff --git a/trunk/block/cfq-iosched.c b/trunk/block/cfq-iosched.c index 039b38cf805c..3df41a00b553 100644 --- a/trunk/block/cfq-iosched.c +++ b/trunk/block/cfq-iosched.c @@ -822,14 +822,13 @@ static struct cfq_queue *cfq_set_active_queue(struct cfq_data *cfqd) #define CIC_SEEKY(cic) ((cic)->seek_mean > (128 * 1024)) -static int cfq_arm_slice_timer(struct cfq_data *cfqd, struct cfq_queue *cfqq) - +static int cfq_arm_slice_timer(struct cfq_data *cfqd) { + struct cfq_queue *cfqq = cfqd->active_queue; struct cfq_io_context *cic; unsigned long sl; WARN_ON(!RB_EMPTY_ROOT(&cfqq->sort_list)); - WARN_ON(cfqq != cfqd->active_queue); /* * idle is disabled, either manually or by past process history @@ -937,7 +936,7 @@ static struct cfq_queue *cfq_select_queue(struct cfq_data *cfqd) cfqq = NULL; goto keep_queue; } else if (cfq_cfqq_class_sync(cfqq)) { - if (cfq_arm_slice_timer(cfqd, cfqq)) + if (cfq_arm_slice_timer(cfqd)) return NULL; } @@ -1734,7 +1733,7 @@ static void cfq_completed_request(request_queue_t *q, struct request *rq) if (cfq_slice_used(cfqq)) cfq_slice_expired(cfqd, 0); else if (sync && RB_EMPTY_ROOT(&cfqq->sort_list)) { - if (!cfq_arm_slice_timer(cfqd, cfqq)) + if (!cfq_arm_slice_timer(cfqd)) cfq_schedule_dispatch(cfqd); } }