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>

1 files changed, 5 insertions, 5 deletions

diff --git a/block/blk.h b/block/blk.h
index 041185e5f129..f46c0ac8ae3d 100644
--- a/block/blk.h
+++ b/block/blk.h
@@ -167,7 +167,7 @@ static inline struct request *__elv_next_request(struct request_queue *q)
                         return NULL;
                 }
                 if (unlikely(blk_queue_bypass(q)) ||
-                    !q->elevator->type->ops.elevator_dispatch_fn(q, 0))
+                    !q->elevator->type->ops.sq.elevator_dispatch_fn(q, 0))
                         return NULL;
         }
 }
@@ -176,16 +176,16 @@ static inline void elv_activate_rq(struct request_queue *q, struct request *rq)
 {
         struct elevator_queue *e = q->elevator;
 
-        if (e->type->ops.elevator_activate_req_fn)
-                e->type->ops.elevator_activate_req_fn(q, rq);
+        if (e->type->ops.sq.elevator_activate_req_fn)
+                e->type->ops.sq.elevator_activate_req_fn(q, rq);
 }
 
 static inline void elv_deactivate_rq(struct request_queue *q, struct request *rq)
 {
         struct elevator_queue *e = q->elevator;
 
-        if (e->type->ops.elevator_deactivate_req_fn)
-                e->type->ops.elevator_deactivate_req_fn(q, rq);
+        if (e->type->ops.sq.elevator_deactivate_req_fn)
+                e->type->ops.sq.elevator_deactivate_req_fn(q, rq);
 }
 
 #ifdef CONFIG_FAIL_IO_TIMEOUT