Attachment 148883 Details for Bug 227135 – linux-2.6.9-scsidump-read16.patch

[patch] linux-2.6.9-scsidump-read16.patch

linux-2.6.9-scsidump-read16.patch (text/plain), 4.15 KB, created by Nobuhiro Tachino on 2007-02-27 19:49:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nobuhiro Tachino

Created: 2007-02-27 19:49:31 UTC

Size: 4.15 KB

patch

obsolete

>diff -Npur linux-2.6.9.org/drivers/block/diskdump.c linux-2.6.9/drivers/block/diskdump.c
>--- linux-2.6.9.org/drivers/block/diskdump.c	2007-02-27 11:40:11.000000000 -0500
>+++ linux-2.6.9/drivers/block/diskdump.c	2007-02-27 11:35:24.000000000 -0500
>@@ -1321,7 +1321,7 @@ static int disk_dump_seq_show(struct seq
> 		return 0;
> 	}
> 
>-	seq_printf(seq, "%s %lu %lu\n", bdevname(dump_part->bdev, buf),
>+	seq_printf(seq, "%s %Lu %Lu\n", bdevname(dump_part->bdev, buf),
> 			dump_part->start_sect, dump_part->nr_sects);
> 	return 0;
> }
>diff -Npur 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-02-27 11:40:11.000000000 -0500
>+++ linux-2.6.9/drivers/scsi/scsi_dump.c	2007-02-27 11:56:19.000000000 -0500
>@@ -57,7 +57,7 @@
> #define Info(x, ...)	pr_info ("scsi_dump: " x "\n", ## __VA_ARGS__)
> 
> /* blocks to 512byte sectors */
>-#define BLOCK_SECTOR(s)	((s) << (DUMP_BLOCK_SHIFT - 9))
>+#define BLOCK_SECTOR(s)	(((sector_t)s) << (DUMP_BLOCK_SHIFT - 9))
> 
> static int set_wce = 1;
> module_param_named(set_wce, set_wce, bool, S_IRUGO|S_IWUSR);
>@@ -178,14 +178,14 @@ static void init_sense_command(struct sc
> /* READ/WRITE */
> static int init_rw_command(struct disk_dump_partition *dump_part,
> 			   struct scsi_device *sdev, struct scsi_cmnd * scmd,
>-			   int rw, int block, void *buf, unsigned int len)
>+			   int rw, sector_t block, void *buf, unsigned int len)
> {
> 	int this_count = len >> 9;
> 
> 	memset(scmd, 0, sizeof(*scmd));
> 
> 	if (block + this_count > dump_part->nr_sects) {
>-		Err("block number %d is larger than %lu",
>+		Err("block number %Lu is larger than %Lu",
> 				block + this_count, dump_part->nr_sects);
> 		return -EFBIG;
> 	}
>@@ -231,15 +231,29 @@ static int init_rw_command(struct disk_d
> 		return -EINVAL;
> 	}
> 
>-	if (this_count > 0xffff)
>-		this_count = 0xffff;
>-
>-	scmd->cmnd[2] = (unsigned char) (block >> 24) & 0xff;
>-	scmd->cmnd[3] = (unsigned char) (block >> 16) & 0xff;
>-	scmd->cmnd[4] = (unsigned char) (block >> 8) & 0xff;
>-	scmd->cmnd[5] = (unsigned char) block & 0xff;
>-	scmd->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff;
>-	scmd->cmnd[8] = (unsigned char) this_count & 0xff;
>+	if (block > 0xffffffff) {
>+		scmd->cmnd[0] += READ_16 - READ_10;
>+		scmd->cmnd[2] = (unsigned char) (block >> 56) & 0xff;
>+		scmd->cmnd[3] = (unsigned char) (block >> 48) & 0xff;
>+		scmd->cmnd[4] = (unsigned char) (block >> 40) & 0xff;
>+		scmd->cmnd[5] = (unsigned char) (block >> 32) & 0xff;
>+		scmd->cmnd[6] = (unsigned char) (block >> 24) & 0xff;
>+		scmd->cmnd[7] = (unsigned char) (block >> 16) & 0xff;
>+		scmd->cmnd[8] = (unsigned char) (block >> 8) & 0xff;
>+		scmd->cmnd[9] = (unsigned char) block & 0xff;
>+		scmd->cmnd[10] = (unsigned char) (this_count >> 24) & 0xff;
>+		scmd->cmnd[11] = (unsigned char) (this_count >> 16) & 0xff;
>+		scmd->cmnd[12] = (unsigned char) (this_count >> 8) & 0xff;
>+		scmd->cmnd[13] = (unsigned char) this_count & 0xff;
>+		scmd->cmnd[14] = scmd->cmnd[15] = 0;
>+	} else {
>+		scmd->cmnd[2] = (unsigned char) (block >> 24) & 0xff;
>+		scmd->cmnd[3] = (unsigned char) (block >> 16) & 0xff;
>+		scmd->cmnd[4] = (unsigned char) (block >> 8) & 0xff;
>+		scmd->cmnd[5] = (unsigned char) block & 0xff;
>+		scmd->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff;
>+		scmd->cmnd[8] = (unsigned char) this_count & 0xff;
>+	}
> 
> 	init_scsi_command(sdev, scmd, buf, len,
> 			(rw == WRITE ? DMA_TO_DEVICE : DMA_FROM_DEVICE), 1);
>@@ -566,7 +580,7 @@ static int scsi_dump_rw_block(struct dis
> {
> 	struct disk_dump_device *dump_device = dump_part->device;
> 	struct scsi_device *sdev = dump_device->device;
>-	int block_nr = BLOCK_SECTOR(dump_block_nr);
>+	sector_t block_nr = BLOCK_SECTOR(dump_block_nr);
> 	int ret;
> 
> 	if (!quiesce_ok) {
>diff -Npur linux-2.6.9.org/include/linux/diskdump.h linux-2.6.9/include/linux/diskdump.h
>--- linux-2.6.9.org/include/linux/diskdump.h	2007-02-27 11:40:11.000000000 -0500
>+++ linux-2.6.9/include/linux/diskdump.h	2007-02-27 11:34:48.000000000 -0500
>@@ -92,8 +92,8 @@ struct disk_dump_partition {
> 	struct list_head part_list;
> 	struct disk_dump_device *device;
> 	struct block_device *bdev;
>-	unsigned long start_sect;
>-	unsigned long nr_sects;
>+	sector_t start_sect;
>+	sector_t nr_sects;
> };
> 
> /* bitmap structure */

Actions: View | Diff

Attachments on bug 227135: 147246 | 148883