block: fix elevator ops

acuicultor · Aug 30, 2021 · 3a367b7 · 3a367b7
1 parent 16fce00
commit 3a367b7
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,