---

yaml --- r: 44295 b: refs/heads/master c: 77d172c h: refs/heads/master i: 44293: cefc9cc 44291: cc00049 44287: 39ae60f v: v3
git-mirror · Dec 12, 2006 · 8cd97ab · 8cd97ab
1 parent 05250a2
commit 8cd97ab
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2b02a1792000900ead4638f4d42fcdd742062cfa
+refs/heads/master: 77d172ce2719b5ad2dc0637452c8871d9cba344c
diff --git a/trunk/block/scsi_ioctl.c b/trunk/block/scsi_ioctl.c
@@ -228,6 +228,7 @@ static int sg_io(struct file *file, request_queue_t *q,
 	struct request *rq;
 	char sense[SCSI_SENSE_BUFFERSIZE];
 	unsigned char cmd[BLK_MAX_CDB];
+	struct bio *bio;
 
 	if (hdr->interface_id != 'S')
 		return -EINVAL;
@@ -308,6 +309,7 @@ static int sg_io(struct file *file, request_queue_t *q,
 	if (ret)
 		goto out;
 
+	bio = rq->bio;
 	rq->retries = 0;
 
 	start_time = jiffies;
@@ -338,6 +340,7 @@ static int sg_io(struct file *file, request_queue_t *q,
 			hdr->sb_len_wr = len;
 	}
 
+	rq->bio = bio;
 	if (blk_rq_unmap_user(rq))
 		ret = -EFAULT;