diff options
| author | Tejun Heo <tj@kernel.org> | 2011-12-14 00:33:41 +0100 |
|---|---|---|
| committer | Jens Axboe <axboe@kernel.dk> | 2011-12-14 00:33:41 +0100 |
| commit | 22f746e235a5cbee2a6ca9887b1be2aa7d31fe71 (patch) | |
| tree | a9786fe9fdb994b5ff69794023e6e3e48e39e0b0 /block/blk.h | |
| parent | f8fc877d3c1f10457d0d73d8540a0c51a1fa718a (diff) | |
| download | linux-3.10-22f746e235a5cbee2a6ca9887b1be2aa7d31fe71.tar.gz linux-3.10-22f746e235a5cbee2a6ca9887b1be2aa7d31fe71.tar.bz2 linux-3.10-22f746e235a5cbee2a6ca9887b1be2aa7d31fe71.zip | |
block: remove elevator_queue->ops
elevator_queue->ops points to the same ops struct ->elevator_type.ops
is pointing to. The only effect of caching it in elevator_queue is
shorter notation - it doesn't save any indirect derefence.
Relocate elevator_type->list which used only during module init/exit
to the end of the structure, rename elevator_queue->elevator_type to
->type, and replace elevator_queue->ops with elevator_queue->type.ops.
This doesn't introduce any functional difference.
Signed-off-by: Tejun Heo <tj@kernel.org>
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Diffstat (limited to 'block/blk.h')
| -rw-r--r-- | block/blk.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/block/blk.h b/block/blk.h index 5bca2668e1b..4943770e079 100644 --- a/block/blk.h +++ b/block/blk.h @@ -94,7 +94,7 @@ static inline struct request *__elv_next_request(struct request_queue *q) return NULL; } if (unlikely(blk_queue_dead(q)) || - !q->elevator->ops->elevator_dispatch_fn(q, 0)) + !q->elevator->type->ops.elevator_dispatch_fn(q, 0)) return NULL; } } @@ -103,16 +103,16 @@ static inline void elv_activate_rq(struct request_queue *q, struct request *rq) { struct elevator_queue *e = q->elevator; - if (e->ops->elevator_activate_req_fn) - e->ops->elevator_activate_req_fn(q, rq); + if (e->type->ops.elevator_activate_req_fn) + e->type->ops.elevator_activate_req_fn(q, rq); } static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq) { struct elevator_queue *e = q->elevator; - if (e->ops->elevator_deactivate_req_fn) - e->ops->elevator_deactivate_req_fn(q, rq); + if (e->type->ops.elevator_deactivate_req_fn) + e->type->ops.elevator_deactivate_req_fn(q, rq); } #ifdef CONFIG_FAIL_IO_TIMEOUT |