diff options
| author | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
|---|---|---|
| committer | Anton Altaparmakov <aia21@cantab.net> | 2005-11-01 10:51:32 -0500 |
| commit | 94b166a7cbc232df279e1f7d5a8acfb6b8d02d59 (patch) | |
| tree | 5cf9a982d3ffe9fde7a1ac679eb994499c09f7f2 /drivers/block/cfq-iosched.c | |
| parent | 3aebf25bdcf030f3e4afeb9340486d5b46deb46e (diff) | |
| parent | 1e4c85f97fe26fbd70da12148b3992c0e00361fd (diff) | |
Merge branch 'master' of /home/src/linux-2.6/
Diffstat (limited to 'drivers/block/cfq-iosched.c')
| -rw-r--r-- | drivers/block/cfq-iosched.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c index 5281f8e70510..ecacca9c877e 100644 --- a/drivers/block/cfq-iosched.c +++ b/drivers/block/cfq-iosched.c | |||
| @@ -2059,10 +2059,8 @@ static void cfq_put_cfqd(struct cfq_data *cfqd) | |||
| 2059 | if (!atomic_dec_and_test(&cfqd->ref)) | 2059 | if (!atomic_dec_and_test(&cfqd->ref)) |
| 2060 | return; | 2060 | return; |
| 2061 | 2061 | ||
| 2062 | blk_put_queue(q); | ||
| 2063 | |||
| 2064 | cfq_shutdown_timer_wq(cfqd); | 2062 | cfq_shutdown_timer_wq(cfqd); |
| 2065 | q->elevator->elevator_data = NULL; | 2063 | blk_put_queue(q); |
| 2066 | 2064 | ||
| 2067 | mempool_destroy(cfqd->crq_pool); | 2065 | mempool_destroy(cfqd->crq_pool); |
| 2068 | kfree(cfqd->crq_hash); | 2066 | kfree(cfqd->crq_hash); |