diff options
Diffstat (limited to 'block/blk-ioc.c')
| -rw-r--r-- | block/blk-ioc.c | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index cbdabb0dd6d7..98e6bf61b0ac 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c | |||
| @@ -39,8 +39,6 @@ int put_io_context(struct io_context *ioc) | |||
| 39 | 39 | ||
| 40 | if (atomic_long_dec_and_test(&ioc->refcount)) { | 40 | if (atomic_long_dec_and_test(&ioc->refcount)) { |
| 41 | rcu_read_lock(); | 41 | rcu_read_lock(); |
| 42 | if (ioc->aic && ioc->aic->dtor) | ||
| 43 | ioc->aic->dtor(ioc->aic); | ||
| 44 | cfq_dtor(ioc); | 42 | cfq_dtor(ioc); |
| 45 | rcu_read_unlock(); | 43 | rcu_read_unlock(); |
| 46 | 44 | ||
| @@ -76,8 +74,6 @@ void exit_io_context(struct task_struct *task) | |||
| 76 | task_unlock(task); | 74 | task_unlock(task); |
| 77 | 75 | ||
| 78 | if (atomic_dec_and_test(&ioc->nr_tasks)) { | 76 | if (atomic_dec_and_test(&ioc->nr_tasks)) { |
| 79 | if (ioc->aic && ioc->aic->exit) | ||
| 80 | ioc->aic->exit(ioc->aic); | ||
| 81 | cfq_exit(ioc); | 77 | cfq_exit(ioc); |
| 82 | 78 | ||
| 83 | } | 79 | } |
| @@ -97,7 +93,6 @@ struct io_context *alloc_io_context(gfp_t gfp_flags, int node) | |||
| 97 | ret->ioprio = 0; | 93 | ret->ioprio = 0; |
| 98 | ret->last_waited = jiffies; /* doesn't matter... */ | 94 | ret->last_waited = jiffies; /* doesn't matter... */ |
| 99 | ret->nr_batch_requests = 0; /* because this is 0 */ | 95 | ret->nr_batch_requests = 0; /* because this is 0 */ |
| 100 | ret->aic = NULL; | ||
| 101 | INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH); | 96 | INIT_RADIX_TREE(&ret->radix_root, GFP_ATOMIC | __GFP_HIGH); |
| 102 | INIT_HLIST_HEAD(&ret->cic_list); | 97 | INIT_HLIST_HEAD(&ret->cic_list); |
| 103 | ret->ioc_data = NULL; | 98 | ret->ioc_data = NULL; |
