diff options
Diffstat (limited to 'block/noop-iosched.c')
-rw-r--r-- | block/noop-iosched.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/block/noop-iosched.c b/block/noop-iosched.c index 1c3de2b9a6b..7563d8aa394 100644 --- a/block/noop-iosched.c +++ b/block/noop-iosched.c | |||
@@ -11,13 +11,13 @@ struct noop_data { | |||
11 | struct list_head queue; | 11 | struct list_head queue; |
12 | }; | 12 | }; |
13 | 13 | ||
14 | static void noop_merged_requests(request_queue_t *q, struct request *rq, | 14 | static void noop_merged_requests(struct request_queue *q, struct request *rq, |
15 | struct request *next) | 15 | struct request *next) |
16 | { | 16 | { |
17 | list_del_init(&next->queuelist); | 17 | list_del_init(&next->queuelist); |
18 | } | 18 | } |
19 | 19 | ||
20 | static int noop_dispatch(request_queue_t *q, int force) | 20 | static int noop_dispatch(struct request_queue *q, int force) |
21 | { | 21 | { |
22 | struct noop_data *nd = q->elevator->elevator_data; | 22 | struct noop_data *nd = q->elevator->elevator_data; |
23 | 23 | ||
@@ -31,14 +31,14 @@ static int noop_dispatch(request_queue_t *q, int force) | |||
31 | return 0; | 31 | return 0; |
32 | } | 32 | } |
33 | 33 | ||
34 | static void noop_add_request(request_queue_t *q, struct request *rq) | 34 | static void noop_add_request(struct request_queue *q, struct request *rq) |
35 | { | 35 | { |
36 | struct noop_data *nd = q->elevator->elevator_data; | 36 | struct noop_data *nd = q->elevator->elevator_data; |
37 | 37 | ||
38 | list_add_tail(&rq->queuelist, &nd->queue); | 38 | list_add_tail(&rq->queuelist, &nd->queue); |
39 | } | 39 | } |
40 | 40 | ||
41 | static int noop_queue_empty(request_queue_t *q) | 41 | static int noop_queue_empty(struct request_queue *q) |
42 | { | 42 | { |
43 | struct noop_data *nd = q->elevator->elevator_data; | 43 | struct noop_data *nd = q->elevator->elevator_data; |
44 | 44 | ||
@@ -46,7 +46,7 @@ static int noop_queue_empty(request_queue_t *q) | |||
46 | } | 46 | } |
47 | 47 | ||
48 | static struct request * | 48 | static struct request * |
49 | noop_former_request(request_queue_t *q, struct request *rq) | 49 | noop_former_request(struct request_queue *q, struct request *rq) |
50 | { | 50 | { |
51 | struct noop_data *nd = q->elevator->elevator_data; | 51 | struct noop_data *nd = q->elevator->elevator_data; |
52 | 52 | ||
@@ -56,7 +56,7 @@ noop_former_request(request_queue_t *q, struct request *rq) | |||
56 | } | 56 | } |
57 | 57 | ||
58 | static struct request * | 58 | static struct request * |
59 | noop_latter_request(request_queue_t *q, struct request *rq) | 59 | noop_latter_request(struct request_queue *q, struct request *rq) |
60 | { | 60 | { |
61 | struct noop_data *nd = q->elevator->elevator_data; | 61 | struct noop_data *nd = q->elevator->elevator_data; |
62 | 62 | ||
@@ -65,7 +65,7 @@ noop_latter_request(request_queue_t *q, struct request *rq) | |||
65 | return list_entry(rq->queuelist.next, struct request, queuelist); | 65 | return list_entry(rq->queuelist.next, struct request, queuelist); |
66 | } | 66 | } |
67 | 67 | ||
68 | static void *noop_init_queue(request_queue_t *q) | 68 | static void *noop_init_queue(struct request_queue *q) |
69 | { | 69 | { |
70 | struct noop_data *nd; | 70 | struct noop_data *nd; |
71 | 71 | ||