From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933131AbaFLNrE (ORCPT ); Thu, 12 Jun 2014 09:47:04 -0400 Received: from casper.infradead.org ([85.118.1.10]:59420 "EHLO casper.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755963AbaFLNq5 (ORCPT ); Thu, 12 Jun 2014 09:46:57 -0400 From: Christoph Hellwig To: James Bottomley Cc: Jens Axboe , Bart Van Assche , Robert Elliot , linux-scsi@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 01/14] sd: don't use rq->cmd_len before setting it up Date: Thu, 12 Jun 2014 15:48:53 +0200 Message-Id: <1402580946-11470-2-git-send-email-hch@lst.de> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1402580946-11470-1-git-send-email-hch@lst.de> References: <1402580946-11470-1-git-send-email-hch@lst.de> X-SRS-Rewrite: SMTP reverse-path rewritten from by casper.infradead.org See http://www.infradead.org/rpr.html Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 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 --- 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 e9689d5..dbd0c51 100644 --- a/drivers/scsi/sd.c +++ b/drivers/scsi/sd.c @@ -810,15 +810,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