diff options
Diffstat (limited to 'block/cfq-iosched.c')
-rw-r--r-- | block/cfq-iosched.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/block/cfq-iosched.c b/block/cfq-iosched.c index 3c5fd9c2c205..2ac35aacbbf9 100644 --- a/block/cfq-iosched.c +++ b/block/cfq-iosched.c | |||
@@ -1752,7 +1752,7 @@ __cfq_may_queue(struct cfq_data *cfqd, struct cfq_queue *cfqq, | |||
1752 | return ELV_MQUEUE_MAY; | 1752 | return ELV_MQUEUE_MAY; |
1753 | } | 1753 | } |
1754 | 1754 | ||
1755 | static int cfq_may_queue(request_queue_t *q, int rw, struct bio *bio) | 1755 | static int cfq_may_queue(request_queue_t *q, int rw) |
1756 | { | 1756 | { |
1757 | struct cfq_data *cfqd = q->elevator->elevator_data; | 1757 | struct cfq_data *cfqd = q->elevator->elevator_data; |
1758 | struct task_struct *tsk = current; | 1758 | struct task_struct *tsk = current; |
@@ -1817,8 +1817,7 @@ static void cfq_put_request(request_queue_t *q, struct request *rq) | |||
1817 | * Allocate cfq data structures associated with this request. | 1817 | * Allocate cfq data structures associated with this request. |
1818 | */ | 1818 | */ |
1819 | static int | 1819 | static int |
1820 | cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio, | 1820 | cfq_set_request(request_queue_t *q, struct request *rq, gfp_t gfp_mask) |
1821 | gfp_t gfp_mask) | ||
1822 | { | 1821 | { |
1823 | struct cfq_data *cfqd = q->elevator->elevator_data; | 1822 | struct cfq_data *cfqd = q->elevator->elevator_data; |
1824 | struct task_struct *tsk = current; | 1823 | struct task_struct *tsk = current; |