1 files changed, 21 insertions, 12 deletions

diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c
index 14ad2a785a34..a7f3f0c84db7 100644
--- a/drivers/scsi/scsi_lib.c
+++ b/drivers/scsi/scsi_lib.c
@@ -1259,6 +1259,26 @@ static void scsi_generic_done(struct scsi_cmnd *cmd)
         scsi_io_completion(cmd, cmd->bufflen, 0);
 }
 
+void scsi_setup_blk_pc_cmnd(struct scsi_cmnd *cmd)
+{
+        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 = req->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;
@@ -1394,18 +1414,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 (rq_data_dir(req) == WRITE)
-                                cmd->sc_data_direction = DMA_TO_DEVICE;
-                        else if (req->data_len)
-                                cmd->sc_data_direction = DMA_FROM_DEVICE;
-                        else
-                                cmd->sc_data_direction = DMA_NONE;
-                        
-                        cmd->transfersize = req->data_len;
-                        cmd->allowed = req->retries;
-                        cmd->timeout_per_command = req->timeout;
+                        scsi_setup_blk_pc_cmnd(cmd);
                         cmd->done = scsi_generic_done;
                 }
         }