From 6c1cb75370f286a51ca35570e35936417cd119f5 Mon Sep 17 00:00:00 2001 From: Brian King Date: Tue, 6 Sep 2005 15:18:04 -0700 Subject: [PATCH] --- yaml --- r: 7418 b: refs/heads/master c: 38f18527592756d24a12e84c0713e8c902ba7f15 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/cfq-iosched.c | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/[refs] b/[refs] index 2a5fb4df9740..87ba274658bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 49e31cbac5be2202f351626fd4fb33ad4d4819b8 +refs/heads/master: 38f18527592756d24a12e84c0713e8c902ba7f15 diff --git a/trunk/drivers/block/cfq-iosched.c b/trunk/drivers/block/cfq-iosched.c index cd056e7e64ec..30c0903c7cdd 100644 --- a/trunk/drivers/block/cfq-iosched.c +++ b/trunk/drivers/block/cfq-iosched.c @@ -2260,8 +2260,6 @@ static void cfq_put_cfqd(struct cfq_data *cfqd) if (!atomic_dec_and_test(&cfqd->ref)) return; - blk_put_queue(q); - cfq_shutdown_timer_wq(cfqd); q->elevator->elevator_data = NULL; @@ -2318,7 +2316,6 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e) e->elevator_data = cfqd; cfqd->queue = q; - atomic_inc(&q->refcnt); cfqd->max_queued = q->nr_requests / 4; q->nr_batching = cfq_queued;