diff options
| author | Jens Axboe | 2017-01-27 23:08:31 +0100 |
|---|---|---|
| committer | Jens Axboe | 2017-01-27 23:08:31 +0100 |
| commit | f924ba70c1b12706c6679d793202e8f4c125f7ae (patch) | |
| tree | 978f8f56ccfa7c6fdb4be4ac6e498d73d44bf14f /block/deadline-iosched.c | |
| parent | Linux 4.10-rc5 (diff) | |
| parent | blk-mq: fix debugfs compilation issues (diff) | |
| download | kernel-qcow2-linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.gz kernel-qcow2-linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.tar.xz kernel-qcow2-linux-f924ba70c1b12706c6679d793202e8f4c125f7ae.zip | |
Merge branch 'for-4.11/block' into for-4.11/rq-refactor
Signed-off-by: Jens Axboe <axboe@fb.com>
Diffstat (limited to 'block/deadline-iosched.c')
| -rw-r--r-- | block/deadline-iosched.c | 2 |
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, |