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-merge.c | |
| parent | c5082b70adfe8e1ea1cf4a8eff92c9f260e364d2 (diff) | |
| download | linux-0-day-c51ca6cf545bc51ad38bd50816bde37c647d608d.tar.gz linux-0-day-c51ca6cf545bc51ad38bd50816bde37c647d608d.tar.xz | |
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-merge.c')
| -rw-r--r-- | block/blk-merge.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index 182398cb15249..480570b691dc6 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -763,8 +763,8 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq, { struct elevator_queue *e = q->elevator; - if (e->type->ops.elevator_allow_rq_merge_fn) - if (!e->type->ops.elevator_allow_rq_merge_fn(q, rq, next)) + if (e->type->ops.sq.elevator_allow_rq_merge_fn) + if (!e->type->ops.sq.elevator_allow_rq_merge_fn(q, rq, next)) return 0; return attempt_merge(q, rq, next); |