[SCSI] scsi_debug: virtual_gb ignores sector_size
authorDouglas Gilbert <dgilbert@interlog.com>
Sun, 25 Apr 2010 10:30:23 +0000 (12:30 +0200)
committerJames Bottomley <James.Bottomley@suse.de>
Sun, 2 May 2010 15:18:55 +0000 (11:18 -0400)
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 <dgilbert@interlog.com>
Cc: Stable Tree <stable@kernel.org>
Signed-off-by: James Bottomley <James.Bottomley@suse.de>
drivers/scsi/scsi_debug.c

index 3e10c306de946b76002738fc0b214a786d6cbc7b..3a5bfd10b2cbd4d419b2a84cb57deeed13c6ad32 100644 (file)
@@ -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;
 }