Skip to content

L
linux-davinci
Commit 25975f86 authored by Al Viro's avatar Al Viro
Browse files
Options

[PATCH] stop cfq from pinning queue down 

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent d9ff4187
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 4 deletions
block/cfq-iosched.c
View file @ 25975f86
...@@ -2121,13 +2121,10 @@ static void cfq_shutdown_timer_wq(struct cfq_data *cfqd) ...@@ -2121,13 +2121,10 @@ static void cfq_shutdown_timer_wq(struct cfq_data *cfqd)
static void cfq_put_cfqd(struct cfq_data *cfqd) static void cfq_put_cfqd(struct cfq_data *cfqd)
{ {
request_queue_t *q = cfqd->queue;
if (!atomic_dec_and_test(&cfqd->ref)) if (!atomic_dec_and_test(&cfqd->ref))
return; return;
cfq_shutdown_timer_wq(cfqd); cfq_shutdown_timer_wq(cfqd);
blk_put_queue(q);
mempool_destroy(cfqd->crq_pool); mempool_destroy(cfqd->crq_pool);
kfree(cfqd->crq_hash); kfree(cfqd->crq_hash);
...@@ -2205,7 +2202,6 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e) ...@@ -2205,7 +2202,6 @@ static int cfq_init_queue(request_queue_t *q, elevator_t *e)
e->elevator_data = cfqd; e->elevator_data = cfqd;
cfqd->queue = q; cfqd->queue = q;
atomic_inc(&q->refcnt);
cfqd->max_queued = q->nr_requests / 4; cfqd->max_queued = q->nr_requests / 4;
q->nr_batching = cfq_queued; q->nr_batching = cfq_queued;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment