From 8cd97ab20cc8adfec8c0490b8da5f00578862e7d Mon Sep 17 00:00:00 2001
From: FUJITA Tomonori <fujita.tomonori@lab.ntt.co.jp>
Date: Mon, 11 Dec 2006 10:01:34 +0100
Subject: [PATCH] --- yaml --- r: 44295 b: refs/heads/master c:
 77d172ce2719b5ad2dc0637452c8871d9cba344c h: refs/heads/master i:   44293:
 cefc9ccf22732058f9e9ec304b49a3f62fddaa79   44291:
 cc0004927ac6bfcc47c9fc04f7987fccd71c71fd   44287:
 39ae60f601a6c6a3f5c79a1666466dd65a36d1c2 v: v3

---
 [refs]                   | 2 +-
 trunk/block/scsi_ioctl.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d464ef3f40dc..dcfd95d47886 100644
--- 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
index b3e210723a71..045cabd3d4b4 100644
--- 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;