The patch titled
scsi: clear garbage after CDBs on SG_IO
has been removed from the -mm tree. Its filename was
scsi-clear-garbage-after-cdbs-on-sg_io.patch
This patch was dropped because it was merged into mainline or a subsystem tree
------------------------------------------------------
Subject: scsi: clear garbage after CDBs on SG_IO
From: Tejun Heo <htejun@xxxxxxxxx>
ATAPI devices transfer fixed number of bytes for CDBs (12 or 16). Some
ATAPI devices choke when shorter CDB is used and the left bytes contain
garbage. Block SG_IO cleared left bytes but SCSI SG_IO didn't. This patch
makes SCSI SG_IO clear it and simplify CDB clearing in block SG_IO.
Signed-off-by: Tejun Heo <htejun@xxxxxxxxx>
Cc: Mathieu Fluhr <mfluhr@xxxxxxxx>
Cc: James Bottomley <James.Bottomley@xxxxxxxxxxxx>
Cc: Douglas Gilbert <dougg@xxxxxxxxxx>
Acked-by: Jens Axboe <jens.axboe@xxxxxxxxxx>
Cc: <stable@xxxxxxxxxx>
Acked-by: Jeff Garzik <jgarzik@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
block/scsi_ioctl.c | 3 +--
drivers/scsi/scsi_lib.c | 1 +
2 files changed, 2 insertions(+), 2 deletions(-)
diff -puN block/scsi_ioctl.c~scsi-clear-garbage-after-cdbs-on-sg_io block/scsi_ioctl.c
--- a/block/scsi_ioctl.c~scsi-clear-garbage-after-cdbs-on-sg_io
+++ a/block/scsi_ioctl.c
@@ -286,9 +286,8 @@ static int sg_io(struct file *file, requ
* 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);
- if (sizeof(rq->cmd) != hdr->cmd_len)
- memset(rq->cmd + hdr->cmd_len, 0, sizeof(rq->cmd) - hdr->cmd_len);
memset(sense, 0, sizeof(sense));
rq->sense = sense;
diff -puN drivers/scsi/scsi_lib.c~scsi-clear-garbage-after-cdbs-on-sg_io drivers/scsi/scsi_lib.c
--- a/drivers/scsi/scsi_lib.c~scsi-clear-garbage-after-cdbs-on-sg_io
+++ a/drivers/scsi/scsi_lib.c
@@ -410,6 +410,7 @@ int scsi_execute_async(struct scsi_devic
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;
_
Patches currently in -mm which might be from htejun@xxxxxxxxx are
origin.patch
git-libata-all.patch
via-pata-controller-xfer-fixes.patch
via-pata-controller-xfer-fixes-fix.patch
file-kill-unnecessary-timer-in-fdtable_defer.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
