block: move existing elevator ops to union

[sfrench/cifs-2.6.git] / block / blk-merge.c

diff --git a/block/blk-merge.c b/block/blk-merge.c
index 182398cb152490d96b7e48c4fd74f11657c8e665..480570b691dc6ffe2d2902e66b5fc7c48511a163 100644 (file)
--- a/block/blk-merge.c
+++ b/block/blk-merge.c
@@ -763,8 +763,8 @@ int blk_attempt_req_merge(struct request_queue *q, struct request *rq,
 {
        struct elevator_queue *e = q->elevator;
 
-       if (e->type->ops.elevator_allow_rq_merge_fn)
-               if (!e->type->ops.elevator_allow_rq_merge_fn(q, rq, next))
+       if (e->type->ops.sq.elevator_allow_rq_merge_fn)
+               if (!e->type->ops.sq.elevator_allow_rq_merge_fn(q, rq, next))
                        return 0;
 
        return attempt_merge(q, rq, next);