aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNamhyung Kim <namhyung@gmail.com>2010-09-16 12:55:57 +0900
committerJens Axboe <jaxboe@fusionio.com>2010-09-16 08:25:45 +0200
commit2610a25406087ef797f4187e7f82dd04335056c7 (patch)
treef9a288acf417b5610c95d8c37bb6367f372e82b5
parentb5af921ec02333e943efb59aca4f56b78fc0e100 (diff)
downloadmrst-s0i3-test-2610a25406087ef797f4187e7f82dd04335056c7.tar.gz
mrst-s0i3-test-2610a25406087ef797f4187e7f82dd04335056c7.tar.xz
mrst-s0i3-test-2610a25406087ef797f4187e7f82dd04335056c7.zip
sg: fix a warning in blk_rq_aligned() call
2nd argument of blk_rq_aligned() has changed to 'unsigned long' by the previous commit 'block: fix an address space warning in blk-map.c'. That commit neglected to update a user of that function. Signed-off-by: Namhyung Kim <namhyung@gmail.com> Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
-rw-r--r--drivers/scsi/sg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/scsi/sg.c b/drivers/scsi/sg.c
index 78d616315d8..655ab920cff 100644
--- a/drivers/scsi/sg.c
+++ b/drivers/scsi/sg.c
@@ -1657,7 +1657,7 @@ static int sg_start_req(Sg_request *srp, unsigned char *cmd)
if (sg_allow_dio && hp->flags & SG_FLAG_DIRECT_IO &&
dxfer_dir != SG_DXFER_UNKNOWN && !iov_count &&
!sfp->parentdp->device->host->unchecked_isa_dma &&
- blk_rq_aligned(q, hp->dxferp, dxfer_len))
+ blk_rq_aligned(q, (unsigned long)hp->dxferp, dxfer_len))
md = NULL;
else
md = &map_data;