Re: [PATCH 01/14] sd: don't use rq->cmd_len before setting it up

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



On 06/25/2014 06:51 PM, Christoph Hellwig wrote:
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@xxxxxx>
---
  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]);

Reviewed-by: Hannes Reinecke <hare@xxxxxxx>

Cheers,

Hannes
--
Dr. Hannes Reinecke		      zSeries & Storage
hare@xxxxxxx			      +49 911 74053 688
SUSE LINUX Products GmbH, Maxfeldstr. 5, 90409 Nürnberg
GF: J. Hawn, J. Guild, F. Imendörffer, HRB 16746 (AG Nürnberg)
--
To unsubscribe from this list: send the line "unsubscribe linux-scsi" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html




[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [SCSI Target Devel]     [Linux SCSI Target Infrastructure]     [Kernel Newbies]     [IDE]     [Security]     [Git]     [Netfilter]     [Bugtraq]     [Yosemite News]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux ATA RAID]     [Linux IIO]     [Samba]     [Device Mapper]
  Powered by Linux