From dee837c853e9b585a1472e0ca1c7920ef7486433 Mon Sep 17 00:00:00 2001
From: Timothy Thelin <Timothy.Thelin@wdc.com>
Date: Tue, 13 Sep 2005 19:56:28 -0700
Subject: [PATCH] --- yaml --- r: 9093 b: refs/heads/master c:
 186d330e682210100c671355580a8592e4a21692 h: refs/heads/master i:   9091:
 7819536345a11ab2b5d8caac522ecd09a64004a6 v: v3

---
 [refs]                        | 2 +-
 trunk/drivers/scsi/scsi_lib.c | 1 +
 trunk/drivers/scsi/sd.c       | 1 +
 trunk/drivers/scsi/sr.c       | 1 +
 trunk/drivers/scsi/st.c       | 1 +
 5 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index d9f407d50e75..84a04e3c6839 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a89f29f6ea8dba0b7c4ae5d1d0b43de6cb500ea6
+refs/heads/master: 186d330e682210100c671355580a8592e4a21692
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 863bb6495daa..f9026d08532a 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -1268,6 +1268,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
 			}
 		} else {
 			memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+			cmd->cmd_len = req->cmd_len;
 			if (rq_data_dir(req) == WRITE)
 				cmd->sc_data_direction = DMA_TO_DEVICE;
 			else if (req->data_len)
diff --git a/trunk/drivers/scsi/sd.c b/trunk/drivers/scsi/sd.c
index de564b386052..9a1dc0cea03c 100644
--- a/trunk/drivers/scsi/sd.c
+++ b/trunk/drivers/scsi/sd.c
@@ -235,6 +235,7 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
 			return 0;
 
 		memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
+		SCpnt->cmd_len = rq->cmd_len;
 		if (rq_data_dir(rq) == WRITE)
 			SCpnt->sc_data_direction = DMA_TO_DEVICE;
 		else if (rq->data_len)
diff --git a/trunk/drivers/scsi/sr.c b/trunk/drivers/scsi/sr.c
index ce63fc8312dc..561901b1cf11 100644
--- a/trunk/drivers/scsi/sr.c
+++ b/trunk/drivers/scsi/sr.c
@@ -326,6 +326,7 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
 			return 0;
 
 		memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
+		SCpnt->cmd_len = rq->cmd_len;
 		if (!rq->data_len)
 			SCpnt->sc_data_direction = DMA_NONE;
 		else if (rq_data_dir(rq) == WRITE)
diff --git a/trunk/drivers/scsi/st.c b/trunk/drivers/scsi/st.c
index a93308ae9736..d001c046551b 100644
--- a/trunk/drivers/scsi/st.c
+++ b/trunk/drivers/scsi/st.c
@@ -4206,6 +4206,7 @@ static int st_init_command(struct scsi_cmnd *SCpnt)
 		return 0;
 
 	memcpy(SCpnt->cmnd, rq->cmd, sizeof(SCpnt->cmnd));
+	SCpnt->cmd_len = rq->cmd_len;
 
 	if (rq_data_dir(rq) == WRITE)
 		SCpnt->sc_data_direction = DMA_TO_DEVICE;