Attachment 298436 Details for Bug 438027 – Patch to fix the length of buffer used in scsi_dump

[patch] Patch to fix the length of buffer used in scsi_dump

linux-2.6.9-diskdump-fix-bufferlen.patch (text/plain), 1.85 KB, created by Takao Indoh on 2008-03-18 18:38:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takao Indoh

Created: 2008-03-18 18:38:32 UTC

Size: 1.85 KB

patch

obsolete

>diff -Nurp linux-2.6.9.org/drivers/scsi/scsi_dump.c linux-2.6.9/drivers/scsi/scsi_dump.c
>--- linux-2.6.9.org/drivers/scsi/scsi_dump.c	2007-11-29 17:44:35.000000000 -0500
>+++ linux-2.6.9/drivers/scsi/scsi_dump.c	2007-11-29 17:52:56.000000000 -0500
>@@ -130,16 +130,6 @@ static void init_scsi_command(struct scs
> 	scmd->eh_timeout.function	= eh_timeout;
> }
> 
>-/* TEST UNIT READY */
>-static void init_test_unit_ready_command(struct scsi_device *sdev,
>-					 struct scsi_cmnd * scmd)
>-{
>-	memset(scmd, 0, sizeof(*scmd));
>-	scmd->cmnd[0] = TEST_UNIT_READY;
>-
>-	init_scsi_command(sdev, scmd, NULL, 0, DMA_NONE, 1);
>-}
>-
> /* MODE SENSE */
> static void init_mode_sense_command(struct scsi_device *sdev,
> 				    struct scsi_cmnd *scmd, void *buf)
>@@ -150,7 +140,7 @@ static void init_mode_sense_command(stru
> 	scmd->cmnd[2] = 0x08;		/* PCF=0 Page 8(Cache) */
> 	scmd->cmnd[4] = 255;
> 
>-	init_scsi_command(sdev, scmd, buf, 256, DMA_FROM_DEVICE, 1);
>+	init_scsi_command(sdev, scmd, buf, 255, DMA_FROM_DEVICE, 1);
> }
> 
> /* MODE SELECT */
>@@ -182,7 +172,7 @@ static void init_sense_command(struct sc
> 	scmd->cmnd[0] = REQUEST_SENSE;
> 	scmd->cmnd[4] = 255;
> 
>-	init_scsi_command(sdev, scmd, buf, 256, DMA_FROM_DEVICE, 1);
>+	init_scsi_command(sdev, scmd, buf, 255, DMA_FROM_DEVICE, 1);
> }
> 
> /* READ/WRITE */
>@@ -513,9 +503,10 @@ static int scsi_dump_reset(struct scsi_d
> {
> 	struct Scsi_Host *host = sdev->host;
> 	struct scsi_host_template *hostt = host->hostt;
>+	char *buf = cmnd_buf;
> 	int ret, i;
> 
>-	init_test_unit_ready_command(sdev, &scsi_dump_cmnd);
>+	init_sense_command(sdev, &scsi_dump_cmnd, buf);
> 
> 	if (hostt->eh_host_reset_handler) {
> 		spin_lock(host->host_lock);
>@@ -538,7 +529,7 @@ static int scsi_dump_reset(struct scsi_d
> 		diskdump_mdelay(1);
> 	}
> 
>-	Dbg("test unit ready");
>+	Dbg("request sense");
> 	if ((ret = send_command(&scsi_dump_cmnd)) < 0) {
> 		Err("sense failed");
> 		return -EIO;

Actions: View | Diff

Attachments on bug 438027: 298436