aboutsummaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c9
1 files changed, 4 insertions, 5 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 924b81b08f86..788d2d81994c 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -796,13 +796,12 @@ struct request *elv_former_request(request_queue_t *q, struct request *rq)
796 return NULL; 796 return NULL;
797} 797}
798 798
799int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio, 799int elv_set_request(request_queue_t *q, struct request *rq, gfp_t gfp_mask)
800 gfp_t gfp_mask)
801{ 800{
802 elevator_t *e = q->elevator; 801 elevator_t *e = q->elevator;
803 802
804 if (e->ops->elevator_set_req_fn) 803 if (e->ops->elevator_set_req_fn)
805 return e->ops->elevator_set_req_fn(q, rq, bio, gfp_mask); 804 return e->ops->elevator_set_req_fn(q, rq, gfp_mask);
806 805
807 rq->elevator_private = NULL; 806 rq->elevator_private = NULL;
808 return 0; 807 return 0;
@@ -816,12 +815,12 @@ void elv_put_request(request_queue_t *q, struct request *rq)
816 e->ops->elevator_put_req_fn(q, rq); 815 e->ops->elevator_put_req_fn(q, rq);
817} 816}
818 817
819int elv_may_queue(request_queue_t *q, int rw, struct bio *bio) 818int elv_may_queue(request_queue_t *q, int rw)
820{ 819{
821 elevator_t *e = q->elevator; 820 elevator_t *e = q->elevator;
822 821
823 if (e->ops->elevator_may_queue_fn) 822 if (e->ops->elevator_may_queue_fn)
824 return e->ops->elevator_may_queue_fn(q, rw, bio); 823 return e->ops->elevator_may_queue_fn(q, rw);
825 824
826 return ELV_MQUEUE_MAY; 825 return ELV_MQUEUE_MAY;
827} 826}