diff options
| author | flar2 <asegaert@gmail.com> | 2019-05-22 18:01:04 -0400 |
|---|---|---|
| committer | GtrCraft <nickvanbokhorst@hotmail.com> | 2022-07-11 16:24:48 +0200 |
| commit | 6fa18ace9d394dbf20789799b6582c9abe7e7d26 (patch) | |
| tree | 8d18c3d096f7244897f8db59b53cb3e3ac9c35ed | |
| parent | ccb79548c75d411e300ea0e007c32a4f461a016e (diff) | |
block: fix elevator ops
| -rw-r--r-- | block/fiops-iosched.c | 6 | ||||
| -rw-r--r-- | block/maple-iosched.c | 2 | ||||
| -rw-r--r-- | block/sio-iosched.c | 2 | ||||
| -rw-r--r-- | block/zen-iosched.c | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/block/fiops-iosched.c b/block/fiops-iosched.c index 7748ee3ea98a..a384fc194c5b 100644 --- a/block/fiops-iosched.c +++ b/block/fiops-iosched.c @@ -534,7 +534,7 @@ fiops_find_rq_fmerge(struct fiops_data *fiopsd, struct bio *bio) return NULL; } -static int fiops_merge(struct request_queue *q, struct request **req, +static enum elv_merge fiops_merge(struct request_queue *q, struct request **req, struct bio *bio) { struct fiops_data *fiopsd = q->elevator->elevator_data; @@ -550,7 +550,7 @@ static int fiops_merge(struct request_queue *q, struct request **req, } static void fiops_merged_request(struct request_queue *q, struct request *req, - int type) + enum elv_merge type) { if (type == ELEVATOR_FRONT_MERGE) { struct fiops_ioc *ioc = RQ_CIC(req); @@ -729,7 +729,7 @@ static struct elv_fs_entry fiops_attrs[] = { }; static struct elevator_type iosched_fiops = { - .ops = { + .ops.sq = { .elevator_merge_fn = fiops_merge, .elevator_merged_fn = fiops_merged_request, .elevator_merge_req_fn = fiops_merged_requests, diff --git a/block/maple-iosched.c b/block/maple-iosched.c index 8655bdb61ca1..beb474e83ec9 100644 --- a/block/maple-iosched.c +++ b/block/maple-iosched.c @@ -421,7 +421,7 @@ static struct elv_fs_entry maple_attrs[] = { }; static struct elevator_type iosched_maple = { - .ops = { + .ops.sq = { .elevator_merge_req_fn = maple_merged_requests, .elevator_dispatch_fn = maple_dispatch_requests, .elevator_add_req_fn = maple_add_request, diff --git a/block/sio-iosched.c b/block/sio-iosched.c index 877062c32d6c..45b97b8db612 100644 --- a/block/sio-iosched.c +++ b/block/sio-iosched.c @@ -370,7 +370,7 @@ static struct elv_fs_entry sio_attrs[] = { }; static struct elevator_type iosched_sio = { - .ops = { + .ops.sq = { .elevator_merge_req_fn = sio_merged_requests, .elevator_dispatch_fn = sio_dispatch_requests, .elevator_add_req_fn = sio_add_request, diff --git a/block/zen-iosched.c b/block/zen-iosched.c index 7e2cb040ccc5..80af3ef83243 100644 --- a/block/zen-iosched.c +++ b/block/zen-iosched.c @@ -254,7 +254,7 @@ static struct elv_fs_entry zen_attrs[] = { }; static struct elevator_type iosched_zen = { - .ops = { + .ops.sq = { .elevator_merge_req_fn = zen_merged_requests, .elevator_dispatch_fn = zen_dispatch_requests, .elevator_add_req_fn = zen_add_request, |