summaryrefslogtreecommitdiffstats
path: root/block/deadline-iosched.c
diff options
context:
space:
mode:
authorJens Axboe <axboe@fb.com>2016-12-10 23:13:59 +0100
committerJens Axboe <axboe@fb.com>2017-01-17 18:03:33 +0100
commitc51ca6cf545bc51ad38bd50816bde37c647d608d (patch)
tree79e0999ed9e6f275be32d261533107ee31ed9436 /block/deadline-iosched.c
parentpartitions/efi: Fix integer overflow in GPT size calculation (diff)
downloadlinux-c51ca6cf545bc51ad38bd50816bde37c647d608d.tar.xz
linux-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/deadline-iosched.c')
-rw-r--r--block/deadline-iosched.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/block/deadline-iosched.c b/block/deadline-iosched.c
index 55e0bb6d7da7..05fc0ea25a98 100644
--- a/block/deadline-iosched.c
+++ b/block/deadline-iosched.c
@@ -439,7 +439,7 @@ static struct elv_fs_entry deadline_attrs[] = {
};
static struct elevator_type iosched_deadline = {
- .ops = {
+ .ops.sq = {
.elevator_merge_fn = deadline_merge,
.elevator_merged_fn = deadline_merged_request,
.elevator_merge_req_fn = deadline_merged_requests,