[patch 3/4] cfq-iosched: fix sparse warnings (__nocast type)

[patch 3/4] cfq-iosched: fix sparse warnings (__nocast type)

[domen]

[-- Attachment #1: sparse-drivers_block_cfq-iosched --]
[-- Type: text/plain, Size: 1823 bytes --]

From: Victor Fusco <victor@cetuc.puc-rio.br>


Fix the sparse warning "implicit cast to nocast type"
 
File/Subsystem: drivers/block/cfq-iosched

Signed-off-by: Victor Fusco <victor@cetuc.puc-rio.br>
Signed-off-by: Domen Puncer <domen@coderock.org>
 

---
 cfq-iosched.c |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

Index: quilt/drivers/block/cfq-iosched.c
===================================================================
--- quilt.orig/drivers/block/cfq-iosched.c
+++ quilt/drivers/block/cfq-iosched.c
@@ -1415,7 +1415,7 @@ static void cfq_exit_io_context(struct c
 }
 
 static struct cfq_io_context *
-cfq_alloc_io_context(struct cfq_data *cfqd, int gfp_mask)
+cfq_alloc_io_context(struct cfq_data *cfqd, unsigned int __nocast gfp_mask)
 {
 	struct cfq_io_context *cic = kmem_cache_alloc(cfq_ioc_pool, gfp_mask);
 
@@ -1510,7 +1510,7 @@ static int cfq_ioc_set_ioprio(struct io_
 
 static struct cfq_queue *
 cfq_get_queue(struct cfq_data *cfqd, unsigned int key, unsigned short ioprio,
-	      int gfp_mask)
+	      unsigned int __nocast gfp_mask)
 {
 	const int hashval = hash_long(key, CFQ_QHASH_SHIFT);
 	struct cfq_queue *cfqq, *new_cfqq = NULL;
@@ -1571,7 +1571,7 @@ out:
  * cfqq, so we don't need to worry about it disappearing
  */
 static struct cfq_io_context *
-cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, int gfp_mask)
+cfq_get_io_context(struct cfq_data *cfqd, pid_t pid, unsigned int __nocast gfp_mask)
 {
 	struct io_context *ioc = NULL;
 	struct cfq_io_context *cic;
@@ -2063,7 +2063,7 @@ static void cfq_put_request(request_queu
  */
 static int
 cfq_set_request(request_queue_t *q, struct request *rq, struct bio *bio,
-		int gfp_mask)
+		unsigned int __nocast gfp_mask)
 {
 	struct cfq_data *cfqd = q->elevator->elevator_data;
 	struct task_struct *tsk = current;

--