diff options
| author | Jens Axboe <axboe@fb.com> | 2016-12-10 15:13:59 -0700 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2017-01-17 10:03:33 -0700 |
| commit | c51ca6cf545bc51ad38bd50816bde37c647d608d (patch) | |
| tree | 79e0999ed9e6f275be32d261533107ee31ed9436 /block/blk-ioc.c | |
| parent | c5082b70adfe8e1ea1cf4a8eff92c9f260e364d2 (diff) | |
| download | lwn-c51ca6cf545bc51ad38bd50816bde37c647d608d.tar.gz lwn-c51ca6cf545bc51ad38bd50816bde37c647d608d.zip | |
block: move existing elevator ops to union
Prep patch for adding MQ ops as well, since doing anon unions with
named initializers doesn't work on older compilers.
Signed-off-by: Jens Axboe <axboe@fb.com>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Reviewed-by: Bart Van Assche <bart.vanassche@sandisk.com>
Reviewed-by: Omar Sandoval <osandov@fb.com>
Diffstat (limited to 'block/blk-ioc.c')
| -rw-r--r-- | block/blk-ioc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/block/blk-ioc.c b/block/blk-ioc.c index 381cb50a673c..ab372092a57d 100644 --- a/block/blk-ioc.c +++ b/block/blk-ioc.c @@ -43,8 +43,8 @@ static void ioc_exit_icq(struct io_cq *icq) if (icq->flags & ICQ_EXITED) return; - if (et->ops.elevator_exit_icq_fn) - et->ops.elevator_exit_icq_fn(icq); + if (et->ops.sq.elevator_exit_icq_fn) + et->ops.sq.elevator_exit_icq_fn(icq); icq->flags |= ICQ_EXITED; } @@ -383,8 +383,8 @@ struct io_cq *ioc_create_icq(struct io_context *ioc, struct request_queue *q, if (likely(!radix_tree_insert(&ioc->icq_tree, q->id, icq))) { hlist_add_head(&icq->ioc_node, &ioc->icq_list); list_add(&icq->q_node, &q->icq_list); - if (et->ops.elevator_init_icq_fn) - et->ops.elevator_init_icq_fn(icq); + if (et->ops.sq.elevator_init_icq_fn) + et->ops.sq.elevator_init_icq_fn(icq); } else { kmem_cache_free(et->icq_cache, icq); icq = ioc_lookup_icq(ioc, q); |