diff options
Diffstat (limited to 'drivers')
-rw-r--r-- | drivers/block/as-iosched.c | 2 | ||||
-rw-r--r-- | drivers/block/cfq-iosched.c | 8 | ||||
-rw-r--r-- | drivers/block/deadline-iosched.c | 2 | ||||
-rw-r--r-- | drivers/block/elevator.c | 2 | ||||
-rw-r--r-- | drivers/block/ll_rw_blk.c | 16 |
5 files changed, 15 insertions, 15 deletions
diff --git a/drivers/block/as-iosched.c b/drivers/block/as-iosched.c index 95c0a3690b0f..1f08e14697e9 100644 --- a/drivers/block/as-iosched.c +++ b/drivers/block/as-iosched.c | |||
@@ -1807,7 +1807,7 @@ static void as_put_request(request_queue_t *q, struct request *rq) | |||
1807 | } | 1807 | } |
1808 | 1808 | ||
1809 | static int as_set_request(request_queue_t *q, struct request *rq, | 1809 | static int as_set_request(request_queue_t *q, struct request *rq, |
1810 | struct bio *bio, int gfp_mask) | 1810 | struct bio *bio, gfp_t gfp_mask) |
1811 | { | 1811 | { |
1812 | struct as_data *ad = q->elevator->elevator_data; | 1812 | struct as_data *ad = q->elevator->elevator_data; |
1813 | struct as_rq *arq = mempool_alloc(ad->arq_pool, gfp_mask); | 1813 | struct as_rq *arq = mempool_alloc(ad->arq_pool, gfp_mask); |
diff --git a/drivers/block/cfq-iosched.c b/drivers/block/cfq-iosched.c index cd056e7e64ec..d3bfe8cfb039 100644 --- a/drivers/block/cfq-iosched.c +++ b/drivers/block/cfq-iosched.c | |||
@@ -1422,7 +1422,7 @@ static void cfq_exit_io_context(struct cfq_io_context *cic) | |||
1422 | } | 1422 | } |
1423 | 1423 | ||
1424 | static struct cfq_io_context * | 1424 | static struct cfq_io_context * |
1425 | cfq_alloc_io_context(struct cfq_data *cfqd, int gfp_mask) | 1425 | cfq_alloc_io_context(struct cfq_data *cfqd, gfp_t gfp_mask) |
1426 | { | 1426 | { |
1427 | struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask); | 1427 | struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask); |
1428 | 1428 | ||
@@ -1517,7 +1517,7 @@ static int cfq_ioc_set_ioprio(struct io_context *ioc, unsigned int ioprio) | |||
1517 | 1517 | ||
1518 | static struct cfq_queue * | 1518 | static struct cfq_queue * |
1519 | cfq_get_queue(struct cfq_data *cfqd, unsigned int key, unsigned short ioprio, | 1519 | cfq_get_queue(struct cfq_data *cfqd, unsigned int key, unsigned short ioprio, |
1520 | int gfp_mask) | 1520 | gfp_t gfp_mask) |
1521 | { | 1521 | { |
1522 | const int hashval = hash_long(key, CFQ_QHASH_SHIFT); | 1522 | const int hashval = hash_long(key, CFQ_QHASH_SHIFT); |
1523 | struct cfq_queue *cfqq, *new_cfqq = NULL; | 1523 | struct cfq_queue *cfqq, *new_cfqq = NULL; |
@@ -1578,7 +1578,7 @@ out: | |||
1578 | * cfqq, so we don't need to worry about it disappearing | 1578 | * cfqq, so we don't need to worry about it disappearing |
1579 | */ | 1579 | */ |
1580 | static struct cfq_io_context * | 1580 | static struct cfq_io_context * |
1581 | cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, int gfp_mask) | 1581 | cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, gfp_t gfp_mask) |
1582 | { | 1582 | { |
1583 | struct io_context *ioc = NULL; | 1583 | struct io_context *ioc = NULL; |
1584 | struct cfq_io_context *cic; | 1584 | struct cfq_io_context *cic; |
@@ -2075,7 +2075,7 @@ static void cfq_put_request(request_queue_t *q, struct request *rq) | |||
2075 | */ | 2075 | */ |
2076 | static int | 2076 | static int |
2077 | cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio, | 2077 | cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio, |
2078 | int gfp_mask) | 2078 | gfp_t gfp_mask) |
2079 | { | 2079 | { |
2080 | struct cfq_data *cfqd = q->elevator->elevator_data; | 2080 | struct cfq_data *cfqd = q->elevator->elevator_data; |
2081 | struct task_struct *tsk = current; | 2081 | struct task_struct *tsk = current; |
diff --git a/drivers/block/deadline-iosched.c b/drivers/block/deadline-iosched.c index 52a3ae5289a0..753546ba2262 100644 --- a/drivers/block/deadline-iosched.c +++ b/drivers/block/deadline-iosched.c | |||
@@ -756,7 +756,7 @@ static void deadline_put_request(request_queue_t *q, struct request *rq) | |||
756 | 756 | ||
757 | static int | 757 | static int |
758 | deadline_set_request(request_queue_t *q, struct request *rq, struct bio *bio, | 758 | deadline_set_request(request_queue_t *q, struct request *rq, struct bio *bio, |
759 | int gfp_mask) | 759 | gfp_t gfp_mask) |
760 | { | 760 | { |
761 | struct deadline_data *dd = q->elevator->elevator_data; | 761 | struct deadline_data *dd = q->elevator->elevator_data; |
762 | struct deadline_rq *drq; | 762 | struct deadline_rq *drq; |
diff --git a/drivers/block/elevator.c b/drivers/block/elevator.c index 98f0126a2deb..c744d2a13062 100644 --- a/drivers/block/elevator.c +++ b/drivers/block/elevator.c | |||
@@ -487,7 +487,7 @@ struct request *elv_former_request(request_queue_t *q, struct request *rq) | |||
487 | } | 487 | } |
488 | 488 | ||
489 | int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio, | 489 | int elv_set_request(request_queue_t *q, struct request *rq, struct bio *bio, |
490 | int gfp_mask) | 490 | gfp_t gfp_mask) |
491 | { | 491 | { |
492 | elevator_t *e = q->elevator; | 492 | elevator_t *e = q->elevator; |
493 | 493 | ||
diff --git a/drivers/block/ll_rw_blk.c b/drivers/block/ll_rw_blk.c index baedac522945..0f64ee7d8d27 100644 --- a/drivers/block/ll_rw_blk.c +++ b/drivers/block/ll_rw_blk.c | |||
@@ -1652,13 +1652,13 @@ static int blk_init_free_list(request_queue_t *q) | |||
1652 | 1652 | ||
1653 | static int __make_request(request_queue_t *, struct bio *); | 1653 | static int __make_request(request_queue_t *, struct bio *); |
1654 | 1654 | ||
1655 | request_queue_t *blk_alloc_queue(int gfp_mask) | 1655 | request_queue_t *blk_alloc_queue(gfp_t gfp_mask) |
1656 | { | 1656 | { |
1657 | return blk_alloc_queue_node(gfp_mask, -1); | 1657 | return blk_alloc_queue_node(gfp_mask, -1); |
1658 | } | 1658 | } |
1659 | EXPORT_SYMBOL(blk_alloc_queue); | 1659 | EXPORT_SYMBOL(blk_alloc_queue); |
1660 | 1660 | ||
1661 | request_queue_t *blk_alloc_queue_node(int gfp_mask, int node_id) | 1661 | request_queue_t *blk_alloc_queue_node(gfp_t gfp_mask, int node_id) |
1662 | { | 1662 | { |
1663 | request_queue_t *q; | 1663 | request_queue_t *q; |
1664 | 1664 | ||
@@ -1787,7 +1787,7 @@ static inline void blk_free_request(request_queue_t *q, struct request *rq) | |||
1787 | } | 1787 | } |
1788 | 1788 | ||
1789 | static inline struct request * | 1789 | static inline struct request * |
1790 | blk_alloc_request(request_queue_t *q, int rw, struct bio *bio, int gfp_mask) | 1790 | blk_alloc_request(request_queue_t *q, int rw, struct bio *bio, gfp_t gfp_mask) |
1791 | { | 1791 | { |
1792 | struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask); | 1792 | struct request *rq = mempool_alloc(q->rq.rq_pool, gfp_mask); |
1793 | 1793 | ||
@@ -1885,7 +1885,7 @@ static void freed_request(request_queue_t *q, int rw) | |||
1885 | * Returns !NULL on success, with queue_lock *not held*. | 1885 | * Returns !NULL on success, with queue_lock *not held*. |
1886 | */ | 1886 | */ |
1887 | static struct request *get_request(request_queue_t *q, int rw, struct bio *bio, | 1887 | static struct request *get_request(request_queue_t *q, int rw, struct bio *bio, |
1888 | int gfp_mask) | 1888 | gfp_t gfp_mask) |
1889 | { | 1889 | { |
1890 | struct request *rq = NULL; | 1890 | struct request *rq = NULL; |
1891 | struct request_list *rl = &q->rq; | 1891 | struct request_list *rl = &q->rq; |
@@ -2019,7 +2019,7 @@ static struct request *get_request_wait(request_queue_t *q, int rw, | |||
2019 | return rq; | 2019 | return rq; |
2020 | } | 2020 | } |
2021 | 2021 | ||
2022 | struct request *blk_get_request(request_queue_t *q, int rw, int gfp_mask) | 2022 | struct request *blk_get_request(request_queue_t *q, int rw, gfp_t gfp_mask) |
2023 | { | 2023 | { |
2024 | struct request *rq; | 2024 | struct request *rq; |
2025 | 2025 | ||
@@ -2251,7 +2251,7 @@ EXPORT_SYMBOL(blk_rq_unmap_user); | |||
2251 | * @gfp_mask: memory allocation flags | 2251 | * @gfp_mask: memory allocation flags |
2252 | */ | 2252 | */ |
2253 | int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf, | 2253 | int blk_rq_map_kern(request_queue_t *q, struct request *rq, void *kbuf, |
2254 | unsigned int len, unsigned int gfp_mask) | 2254 | unsigned int len, gfp_t gfp_mask) |
2255 | { | 2255 | { |
2256 | struct bio *bio; | 2256 | struct bio *bio; |
2257 | 2257 | ||
@@ -3393,7 +3393,7 @@ void exit_io_context(void) | |||
3393 | * but since the current task itself holds a reference, the context can be | 3393 | * but since the current task itself holds a reference, the context can be |
3394 | * used in general code, so long as it stays within `current` context. | 3394 | * used in general code, so long as it stays within `current` context. |
3395 | */ | 3395 | */ |
3396 | struct io_context *current_io_context(int gfp_flags) | 3396 | struct io_context *current_io_context(gfp_t gfp_flags) |
3397 | { | 3397 | { |
3398 | struct task_struct *tsk = current; | 3398 | struct task_struct *tsk = current; |
3399 | struct io_context *ret; | 3399 | struct io_context *ret; |
@@ -3424,7 +3424,7 @@ EXPORT_SYMBOL(current_io_context); | |||
3424 | * | 3424 | * |
3425 | * This is always called in the context of the task which submitted the I/O. | 3425 | * This is always called in the context of the task which submitted the I/O. |
3426 | */ | 3426 | */ |
3427 | struct io_context *get_io_context(int gfp_flags) | 3427 | struct io_context *get_io_context(gfp_t gfp_flags) |
3428 | { | 3428 | { |
3429 | struct io_context *ret; | 3429 | struct io_context *ret; |
3430 | ret = current_io_context(gfp_flags); | 3430 | ret = current_io_context(gfp_flags); |