[SCSI] scsi_debug: virtual_gb ignores sector_size

doug-gilbert · James Bottomley · commit 5447ed6c968e · 2010-05-02T11:18:55.000-04:00
In the scsi_debug driver, the virtual_gb option ignores the
sector_size, implicitly assuming that is 512 bytes.  So if
'virtual_gb=1 sector_size=4096' the result is an 8 GB (virtual) disk.

Signed-off-by: Douglas Gilbert &lt;dgilbert@interlog.com&gt;
Cc: Stable Tree &lt;stable@kernel.org&gt;
Signed-off-by: James Bottomley &lt;James.Bottomley@suse.de&gt;
diff --git a/drivers/scsi/scsi_debug.c b/drivers/scsi/scsi_debug.c
@@ -957,7 +957,8 @@ static int resp_start_stop(struct scsi_cmnd * scp,
 static sector_t get_sdebug_capacity(void)
 {
 	if (scsi_debug_virtual_gb > 0)
-		return 2048 * 1024 * (sector_t)scsi_debug_virtual_gb;
+		return (sector_t)scsi_debug_virtual_gb *
+			(1073741824 / scsi_debug_sector_size);
 	else
 		return sdebug_store_sectors;
 }

Original file line number	Diff line number	Diff line change
`@@ -957,7 +957,8 @@ static int resp_start_stop(struct scsi_cmnd * scp,`
`957`	`957`	`static sector_t get_sdebug_capacity(void)`
`958`	`958`	`{`
`959`	`959`	`if (scsi_debug_virtual_gb > 0)`
`960`		`- return 2048 * 1024 * (sector_t)scsi_debug_virtual_gb;`
	`960`	`+ return (sector_t)scsi_debug_virtual_gb *`
	`961`	`+ (1073741824 / scsi_debug_sector_size);`
`961`	`962`	`else`
`962`	`963`	`return sdebug_store_sectors;`
`963`	`964`	`}`