diff options
| author | Greg KH <gregkh@suse.de> | 2005-09-12 12:45:04 -0700 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-09-12 12:45:04 -0700 |
| commit | d58dde0f552a5c5c4485b962d8b6e9dd54fefb30 (patch) | |
| tree | d9a7e35eb88fea6265d5aadcc3d4ed39122b052a /drivers/block/cfq-iosched.c | |
| parent | 877599fdef5ea4a7dd1956e22fa9d6923add97f8 (diff) | |
| parent | 2ade81473636b33aaac64495f89a7dc572c529f0 (diff) | |
| download | op-kernel-dev-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.zip op-kernel-dev-d58dde0f552a5c5c4485b962d8b6e9dd54fefb30.tar.gz | |
Merge ../torvalds-2.6/
Diffstat (limited to 'drivers/block/cfq-iosched.c')
| -rw-r--r-- | drivers/block/cfq-iosched.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c index 30c0903..cd056e7 100644 --- a/drivers/block/cfq-iosched.c +++ b/drivers/block/cfq-iosched.c @@ -2260,6 +2260,8 @@ 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; @@ -2316,6 +2318,7 @@ 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; |
