| From | Christoph Hellwig <> | Subject | [PATCH 01/14] sd: don't use rq->cmd_len before setting it up | Date | Wed, 25 Jun 2014 18:51:48 +0200 |
| |
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> --- drivers/scsi/sd.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c index 9c86e3d..6ec4ffe 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -824,15 +824,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]); -- 1.7.10.4
|