Merge commit 'origin' into devel

1 files changed, 5 insertions, 1 deletions

diff --git a/drivers/scsi/scsi_tgt_lib.c b/drivers/scsi/scsi_tgt_lib.c
index 3677fbb30b72..a0f308bd145b 100644
--- a/drivers/scsi/scsi_tgt_lib.c
+++ b/drivers/scsi/scsi_tgt_lib.c
@@ -103,7 +103,6 @@ struct scsi_cmnd *scsi_host_get_command(struct Scsi_Host *shost,
         if (!cmd)
                 goto release_rq;
 
-        memset(cmd, 0, sizeof(*cmd));
         cmd->sc_data_direction = data_dir;
         cmd->jiffies_at_alloc = jiffies;
         cmd->request = rq;
@@ -382,6 +381,11 @@ static int scsi_map_user_pages(struct scsi_tgt_cmd *tcmd, struct scsi_cmnd *cmd,
                 scsi_release_buffers(cmd);
                 goto unmap_rq;
         }
+        /*
+         * we use REQ_TYPE_BLOCK_PC so scsi_init_io doesn't set the
+         * length for us.
+         */
+        cmd->sdb.length = rq->data_len;
 
         return 0;