1 files changed, 10 insertions, 39 deletions

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 5a5457ac9cdb..f52b74cf8d1e 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1275,18 +1275,19 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
         struct scsi_disk *sdkp = scsi_disk(bdev->bd_disk);
         struct scsi_device *sdp = sdkp->device;
         struct Scsi_Host *host = sdp->host;
+        sector_t capacity = logical_to_sectors(sdp, sdkp->capacity);
         int diskinfo[4];
 
         /* default to most commonly used values */
-        diskinfo[0] = 0x40;     /* 1 << 6 */
-        diskinfo[1] = 0x20;     /* 1 << 5 */
-        diskinfo[2] = sdkp->capacity >> 11;
-        
+        diskinfo[0] = 0x40;     /* 1 << 6 */
+        diskinfo[1] = 0x20;     /* 1 << 5 */
+        diskinfo[2] = capacity >> 11;
+
         /* override with calculated, extended default, or driver values */
         if (host->hostt->bios_param)
-                host->hostt->bios_param(sdp, bdev, sdkp->capacity, diskinfo);
+                host->hostt->bios_param(sdp, bdev, capacity, diskinfo);
         else
-                scsicam_bios_param(bdev, sdkp->capacity, diskinfo);
+                scsicam_bios_param(bdev, capacity, diskinfo);
 
         geo->heads = diskinfo[0];
         geo->sectors = diskinfo[1];
@@ -2337,14 +2338,6 @@ got_data:
         if (sdkp->capacity > 0xffffffff)
                 sdp->use_16_for_rw = 1;
 
-        /* Rescale capacity to 512-byte units */
-        if (sector_size == 4096)
-                sdkp->capacity <<= 3;
-        else if (sector_size == 2048)
-                sdkp->capacity <<= 2;
-        else if (sector_size == 1024)
-                sdkp->capacity <<= 1;
-
         blk_queue_physical_block_size(sdp->request_queue,
                                       sdkp->physical_block_size);
         sdkp->device->sector_size = sector_size;
@@ -2795,28 +2788,6 @@ static void sd_read_write_same(struct scsi_disk *sdkp, unsigned char *buffer)
                 sdkp->ws10 = 1;
 }
 
-static int sd_try_extended_inquiry(struct scsi_device *sdp)
-{
-        /* Attempt VPD inquiry if the device blacklist explicitly calls
-         * for it.
-         */
-        if (sdp->try_vpd_pages)
-                return 1;
-        /*
-         * Although VPD inquiries can go to SCSI-2 type devices,
-         * some USB ones crash on receiving them, and the pages
-         * we currently ask for are for SPC-3 and beyond
-         */
-        if (sdp->scsi_level > SCSI_SPC_2 && !sdp->skip_vpd_pages)
-                return 1;
-        return 0;
-}
-
-static inline u32 logical_to_sectors(struct scsi_device *sdev, u32 blocks)
-{
-        return blocks << (ilog2(sdev->sector_size) - 9);
-}
-
 /**
  *      sd_revalidate_disk - called the first time a new disk is seen,
  *      performs disk spin up, read_capacity, etc.
@@ -2856,7 +2827,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (sdkp->media_present) {
                 sd_read_capacity(sdkp, buffer);
 
-                if (sd_try_extended_inquiry(sdp)) {
+                if (scsi_device_supports_vpd(sdp)) {
                         sd_read_block_provisioning(sdkp);
                         sd_read_block_limits(sdkp);
                         sd_read_block_characteristics(sdkp);
@@ -2891,7 +2862,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         if (sdkp->opt_xfer_blocks &&
             sdkp->opt_xfer_blocks <= dev_max &&
             sdkp->opt_xfer_blocks <= SD_DEF_XFER_BLOCKS &&
-            sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_CACHE_SIZE)
+            sdkp->opt_xfer_blocks * sdp->sector_size >= PAGE_SIZE)
                 rw_max = q->limits.io_opt =
                         sdkp->opt_xfer_blocks * sdp->sector_size;
         else
@@ -2900,7 +2871,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
         /* Combine with controller limits */
         q->limits.max_sectors = min(rw_max, queue_max_hw_sectors(q));
 
-        set_capacity(disk, sdkp->capacity);
+        set_capacity(disk, logical_to_sectors(sdp, sdkp->capacity));
         sd_config_write_same(sdkp);
         kfree(buffer);