diff options
| author | Christoph Hellwig <hch@lst.de> | 2014-06-25 18:51:48 +0200 |
|---|---|---|
| committer | Jens Axboe <axboe@fb.com> | 2015-04-02 12:12:27 -0600 |
| commit | f36a476517868e9a55e5a4393fc95b031505d7d4 (patch) | |
| tree | caaf6357231c116c8a652617eeb4ecf653872f9b | |
| parent | b93e3da75e9f97debe37e3b8f1ca5eaeb4317b94 (diff) | |
sd: don't use rq->cmd_len before setting it up
Unlike the old request code blk-mq doesn't initialize cmd_len with a
default value, so don't rely on it being set in sd_setup_write_same_cmnd.
Signed-off-by: Christoph Hellwig <hch@lst.de>
| -rw-r--r-- | drivers/scsi/sd.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 6de9ddf95652..a10ef67a2b0e 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -800,15 +800,16 @@ static int sd_setup_write_same_cmnd(struct scsi_device *sdp, struct request *rq) rq->__data_len = sdp->sector_size; rq->timeout = SD_WRITE_SAME_TIMEOUT; - memset(rq->cmd, 0, rq->cmd_len); if (sdkp->ws16 || sector > 0xffffffff || nr_sectors > 0xffff) { rq->cmd_len = 16; + memset(rq->cmd, 0, rq->cmd_len); rq->cmd[0] = WRITE_SAME_16; put_unaligned_be64(sector, &rq->cmd[2]); put_unaligned_be32(nr_sectors, &rq->cmd[10]); } else { rq->cmd_len = 10; + memset(rq->cmd, 0, rq->cmd_len); rq->cmd[0] = WRITE_SAME; put_unaligned_be32(sector, &rq->cmd[2]); put_unaligned_be16(nr_sectors, &rq->cmd[7]); |