4 files changed, 26 insertions, 62 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 097888721ec4..9be5769d44aa 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1078,6 +1078,26 @@ static void scsi_generic_done(struct scsi_cmnd *cmd)
         scsi_io_completion(cmd, cmd->result == 0 ? cmd->bufflen : 0, 0);
 }
 
+void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd, int retries)
+{
+        struct request *req = cmd->request;
+
+        BUG_ON(sizeof(req->cmd) > sizeof(cmd->cmnd));
+        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
+        cmd->cmd_len = req->cmd_len;
+        if (!req->data_len)
+                cmd->sc_data_direction = DMA_NONE;
+        else if (rq_data_dir(req) == WRITE)
+                cmd->sc_data_direction = DMA_TO_DEVICE;
+        else
+                cmd->sc_data_direction = DMA_FROM_DEVICE;
+        
+        cmd->transfersize = req->data_len;
+        cmd->allowed = retries;
+        cmd->timeout_per_command = req->timeout;
+}
+EXPORT_SYMBOL_GPL(scsi_setup_blk_pc_cmnd);
+
 static int scsi_prep_fn(struct request_queue *q, struct request *req)
 {
         struct scsi_device *sdev = q->queuedata;
@@ -1213,18 +1233,7 @@ static int scsi_prep_fn(struct request_queue *q, struct request *req)
                                 goto kill;
                         }
                 } else {
-                        memcpy(cmd->cmnd, req->cmd, sizeof(cmd->cmnd));
-                        cmd->cmd_len = req->cmd_len;
-                        if (!req->data_len)
-                                cmd->sc_data_direction = DMA_NONE;
-                        else if (rq_data_dir(req) == WRITE)
-                                cmd->sc_data_direction = DMA_TO_DEVICE;
-                        else
-                                cmd->sc_data_direction = DMA_FROM_DEVICE;
-                        
-                        cmd->transfersize = req->data_len;
-                        cmd->allowed = 3;
-                        cmd->timeout_per_command = req->timeout;
+                        scsi_setup_blk_pc_cmnd(cmd, 3);
                         cmd->done = scsi_generic_done;
                 }
         }
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 8613a1317712..03fcbab30033 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -245,24 +245,10 @@ static int sd_init_command(struct scsi_cmnd * SCpnt)
          * SG_IO from block layer already setup, just copy cdb basically
          */
         if (blk_pc_request(rq)) {
-                if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                        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)
-                        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-                else
-                        SCpnt->sc_data_direction = DMA_NONE;
-
-                this_count = rq->data_len;
+                scsi_setup_blk_pc_cmnd(SCpnt, SD_PASSTHROUGH_RETRIES);
                 if (rq->timeout)
                         timeout = rq->timeout;
 
-                SCpnt->transfersize = rq->data_len;
-                SCpnt->allowed = SD_PASSTHROUGH_RETRIES;
                 goto queue;
         }
 
diff --git a/drivers/scsi/sr.c b/drivers/scsi/sr.c
index d68cea753bb2..fb4012b5c188 100644
--- a/drivers/scsi/sr.c
+++ b/drivers/scsi/sr.c
@@ -320,25 +320,11 @@ static int sr_init_command(struct scsi_cmnd * SCpnt)
          * these are already setup, just copy cdb basically
          */
         if (SCpnt->request->flags & REQ_BLOCK_PC) {
-                struct request *rq = SCpnt->request;
+                scsi_setup_blk_pc_cmnd(SCpnt, MAX_RETRIES);
 
-                if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                        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)
-                        SCpnt->sc_data_direction = DMA_TO_DEVICE;
-                else
-                        SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-
-                this_count = rq->data_len;
-                if (rq->timeout)
-                        timeout = rq->timeout;
+                if (SCpnt->timeout_per_command)
+                        timeout = SCpnt->timeout_per_command;
 
-                SCpnt->transfersize = rq->data_len;
                 goto queue;
         }
 
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 7ac6ea141fff..dd592f6a2529 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -4194,27 +4194,10 @@ static void st_intr(struct scsi_cmnd *SCpnt)
  */
 static int st_init_command(struct scsi_cmnd *SCpnt)
 {
-        struct request *rq;
-
         if (!(SCpnt->request->flags & REQ_BLOCK_PC))
                 return 0;
 
-        rq = SCpnt->request;
-        if (sizeof(rq->cmd) > sizeof(SCpnt->cmnd))
-                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)
-                SCpnt->sc_data_direction = DMA_FROM_DEVICE;
-        else
-                SCpnt->sc_data_direction = DMA_NONE;
-
-        SCpnt->timeout_per_command = rq->timeout;
-        SCpnt->transfersize = rq->data_len;
+        scsi_setup_blk_pc_cmnd(SCpnt, 0);
         SCpnt->done = st_intr;
         return 1;
 }