Upper layer is already passing in enough information via req->cmd_len and requiring it to do the same thing twice makes it easy to miss - scsi_execute() doesn't do it. Now that libata is updated to handle garbage after CDB, remove unnecessary CDB clearing. Signed-off-by: Tejun Heo <htejun@xxxxxxxxx> Cc: Jens Axboe <jens.axboe@xxxxxxxxxx> Cc: Douglas Gilbert <dougg@xxxxxxxxxx> --- The previous one was [PATCH 1/2], sorry. block/scsi_ioctl.c | 1 - drivers/scsi/scsi_lib.c | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c index f322b6a..513d82c 100644 --- a/block/scsi_ioctl.c +++ b/block/scsi_ioctl.c @@ -262,7 +262,6 @@ static int sg_io(struct file *file, request_queue_t *q, * fill in request structure */ rq->cmd_len = hdr->cmd_len; - memset(rq->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ memcpy(rq->cmd, cmd, hdr->cmd_len); memset(sense, 0, sizeof(sense)); diff --git a/drivers/scsi/scsi_lib.c b/drivers/scsi/scsi_lib.c index 1748e27..a1df156 100644 --- a/drivers/scsi/scsi_lib.c +++ b/drivers/scsi/scsi_lib.c @@ -410,7 +410,6 @@ int scsi_execute_async(struct scsi_device *sdev, const unsigned char *cmd, goto free_req; req->cmd_len = cmd_len; - memset(req->cmd, 0, BLK_MAX_CDB); /* ATAPI hates garbage after CDB */ memcpy(req->cmd, cmd, req->cmd_len); req->sense = sioc->sense; req->sense_len = 0; -- 1.4.4.2 - 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
