tree bca12f46d6ea3039896406081826d7db37b0384e
parent f1970baf6d74e03bd32072ab453f2fc01bc1b8d3
author James Bottomley <[EMAIL PROTECTED]> Mon, 20 Jun 2005 14:07:17 +0200
committer Jens Axboe <[EMAIL PROTECTED]> Mon, 20 Jun 2005 14:07:17 +0200
[PATCH] The blk_rq_map_user() change missed an update in scsi_ioctl.c
Signed-off-by: Jens Axboe <[EMAIL PROTECTED]>
drivers/block/scsi_ioctl.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/drivers/block/scsi_ioctl.c b/drivers/block/scsi_ioctl.c
--- a/drivers/block/scsi_ioctl.c
+++ b/drivers/block/scsi_ioctl.c
@@ -216,7 +216,7 @@ static int sg_io(struct file *file, requ
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, requ
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, requ
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
-
To unsubscribe from this list: send the line "unsubscribe git-commits-head" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at http://vger.kernel.org/majordomo-info.html
