aboutsummaryrefslogtreecommitdiff
path: root/drivers/block/scsi_ioctl.c
diff options
context:
space:
mode:
authorJames Bottomley <James.Bottomley@SteelEye.com>2005-06-20 14:07:17 +0200
committerJens Axboe <axboe@suse.de>2005-06-20 14:07:17 +0200
commite1f546e185e9d8cb9303d74d1cd5bc704f265384 (patch)
treebca12f46d6ea3039896406081826d7db37b0384e /drivers/block/scsi_ioctl.c
parentf1970baf6d74e03bd32072ab453f2fc01bc1b8d3 (diff)
[PATCH] The blk_rq_map_user() change missed an update in scsi_ioctl.c
Signed-off-by: Jens Axboe <axboe@suse.de>
Diffstat (limited to 'drivers/block/scsi_ioctl.c')
-rw-r--r--drivers/block/scsi_ioctl.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
index 09a7e73a081..b35cb75c752 100644
--- a/drivers/block/scsi_ioctl.c
+++ b/drivers/block/scsi_ioctl.c
@@ -216,7 +216,7 @@ static int sg_io(struct file *file, request_queue_t *q,
struct gendisk *bd_disk, struct sg_io_hdr *hdr)
{
unsigned long start_time;
- int reading, writing, ret;
+ int reading, writing, ret = 0;
struct request *rq;
struct bio *bio;
char sense[SCSI_SENSE_BUFFERSIZE];
@@ -249,7 +249,6 @@ static int sg_io(struct file *file, request_queue_t *q,
reading = 1;
break;
}
- }
rq = blk_get_request(q, writing ? WRITE : READ, GFP_KERNEL);
if (!rq)
@@ -335,7 +334,7 @@ static int sg_io(struct file *file, request_queue_t *q,
hdr->sb_len_wr = len;
}
- if (blk_rq_unmap_user(rq, bio, hdr->dxfer_len))
+ if (blk_rq_unmap_user(bio, hdr->dxfer_len))
ret = -EFAULT;
/* may not have succeeded, but output values written to control