kpriv/linux-hardened
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[PATCH] The blk_rq_map_user() change missed an update in scsi_ioctl.c

Browse source 
Signed-off-by: Jens Axboe <axboe@suse.de>
This commit is contained in:
James Bottomley 2005-06-20 14:07:17 +02:00 committed by Jens Axboe
parent f1970baf6d
commit e1f546e185
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
drivers/block/scsi_ioctl.c
View file

@ -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