diff options
| author |   Namhyung Kim <namhyung@gmail.com> | 2010-09-15 13:08:27 +0200 |
|---|---|---|
| committer |   Jens Axboe <jaxboe@fusionio.com> | 2010-09-15 13:08:27 +0200 |
| commit | 144177991ca624841ddbd1e7edff958fc0f6d1fe (patch) | |
| tree | 793a42427d46585c0acfcfe97d23e604174a2c10 /include/linux/blkdev.h | |
| parent | block: block_dump: Add number of sectors to debug output (diff) | |
| download | linux-dev-144177991ca624841ddbd1e7edff958fc0f6d1fe.tar.xz linux-dev-144177991ca624841ddbd1e7edff958fc0f6d1fe.zip | |
block: fix an address space warning in blk-map.c
Change type of 2nd parameter of blk_rq_aligned() into unsigned long
and remove unnecessary casting. Now we can call it with 'uaddr'
instead of 'ubuf' in __blk_rq_map_user() so that it can remove
following warnings from sparse:
block/blk-map.c:57:31: warning: incorrect type in argument 2 (different address spaces)
block/blk-map.c:57:31: expected void *addr
block/blk-map.c:57:31: got void [noderef] <asn:1>*ubuf
However blk_rq_map_kern() needs one more local variable to handle it.
Signed-off-by: Namhyung Kim <namhyung@gmail.com>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'include/linux/blkdev.h')
| -rw-r--r-- | include/linux/blkdev.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index 7e661106270a..780824edac16 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h @@ -1097,11 +1097,11 @@ static inline int queue_dma_alignment(struct request_queue *q) return q ? q->dma_alignment : 511; } -static inline int blk_rq_aligned(struct request_queue *q, void *addr, +static inline int blk_rq_aligned(struct request_queue *q, unsigned long addr, unsigned int len) { unsigned int alignment = queue_dma_alignment(q) | q->dma_pad_mask; - return !((unsigned long)addr & alignment) && !(len & alignment); + return !(addr & alignment) && !(len & alignment); } /* assumes size > 256 */ |