aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/cfq-iosched.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/cfq-iosched.c')
-rw-r--r--drivers/block/cfq-iosched.c8
1 files changed, 4 insertions, 4 deletions
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
1424static struct cfq_io_context * 1424static struct cfq_io_context *
1425cfq_alloc_io_context(struct cfq_data *cfqd, int gfp_mask) 1425cfq_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
1518static struct cfq_queue * 1518static struct cfq_queue *
1519cfq_get_queue(struct cfq_data *cfqd, unsigned int key, unsigned short ioprio, 1519cfq_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 */
1580static struct cfq_io_context * 1580static struct cfq_io_context *
1581cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, int gfp_mask) 1581cfq_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 */
2076static int 2076static int
2077cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio, 2077cfq_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;