sg: fix a warning in blk_rq_aligned() call
authorNamhyung Kim <namhyung@gmail.com>
Thu, 16 Sep 2010 03:55:57 +0000 (12:55 +0900)
committerJens Axboe <jaxboe@fusionio.com>
Thu, 16 Sep 2010 06:25:45 +0000 (08:25 +0200)
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>
drivers/scsi/sg.c

index 78d616315d8e18e1de032cc895d65801ef81a54a..655ab920cff4cdbb6b6a3a1505dee088d5dba47c 100644 (file)
@@ -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;