12 files changed, 48 insertions, 46 deletions

diff --git a/drivers/scsi/Kconfig b/drivers/scsi/Kconfig
index 5bf3f07870ba..4cd280e86966 100644
--- a/drivers/scsi/Kconfig
+++ b/drivers/scsi/Kconfig
@@ -230,6 +230,7 @@ config SCSI_SCAN_ASYNC
           The SCSI subsystem can probe for devices while the rest of the
           system continues booting, and even probe devices on different
           busses in parallel, leading to a significant speed-up.
+
           If you have built SCSI as modules, enabling this option can
           be a problem as the devices may not have been found by the
           time your system expects them to have been.  You can load the
@@ -237,8 +238,8 @@ config SCSI_SCAN_ASYNC
           If you build your SCSI drivers into the kernel, then everything
           will work fine if you say Y here.
 
-          You can override this choice by specifying scsi_mod.scan="sync"
-          or "async" on the kernel's command line.
+          You can override this choice by specifying "scsi_mod.scan=sync"
+          or async on the kernel's command line.
 
 menu "SCSI Transports"
         depends on SCSI
diff --git a/drivers/scsi/a100u2w.c b/drivers/scsi/a100u2w.c
index 2650a5d0a161..7f4241bfb9c4 100644
--- a/drivers/scsi/a100u2w.c
+++ b/drivers/scsi/a100u2w.c
@@ -1067,7 +1067,7 @@ static int __devinit inia100_probe_one(struct pci_dev *pdev,
                 goto out_disable_device;
         }
 
-        /* <02> read from base address + 0x50 offset to get the bios balue. */
+        /* <02> read from base address + 0x50 offset to get the bios value. */
         bios = ORC_RDWORD(port, 0x50);
 
 
diff --git a/drivers/scsi/arm/eesox.c b/drivers/scsi/arm/eesox.c
index 4677152142d9..d4136524fc46 100644
--- a/drivers/scsi/arm/eesox.c
+++ b/drivers/scsi/arm/eesox.c
@@ -196,7 +196,7 @@ static void eesoxscsi_buffer_in(void *buf, int length, void __iomem *base)
         const void __iomem *reg_fas = base + EESOX_FAS216_OFFSET;
         const void __iomem *reg_dmastat = base + EESOX_DMASTAT;
         const void __iomem *reg_dmadata = base + EESOX_DMADATA;
-        const register unsigned long mask = 0xffff;
+        register const unsigned long mask = 0xffff;
 
         do {
                 unsigned int status;
diff --git a/drivers/scsi/ide-scsi.c b/drivers/scsi/ide-scsi.c
index 8f6b5bf580f6..2b5b8a93bc10 100644
--- a/drivers/scsi/ide-scsi.c
+++ b/drivers/scsi/ide-scsi.c
@@ -801,15 +801,10 @@ static int idescsi_ide_open(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
         struct ide_scsi_obj *scsi;
-        ide_drive_t *drive;
 
         if (!(scsi = ide_scsi_get(disk)))
                 return -ENXIO;
 
-        drive = scsi->drive;
-
-        drive->usage++;
-
         return 0;
 }
 
@@ -817,9 +812,6 @@ static int idescsi_ide_release(struct inode *inode, struct file *filp)
 {
         struct gendisk *disk = inode->i_bdev->bd_disk;
         struct ide_scsi_obj *scsi = ide_scsi_g(disk);
-        ide_drive_t *drive = scsi->drive;
-
-        drive->usage--;
 
         ide_scsi_put(scsi);
 
diff --git a/drivers/scsi/osst.c b/drivers/scsi/osst.c
index 9668b73872c7..a967fadb7439 100644
--- a/drivers/scsi/osst.c
+++ b/drivers/scsi/osst.c
@@ -5574,14 +5574,14 @@ static ssize_t osst_version_show(struct device_driver *ddd, char *buf)
 
 static DRIVER_ATTR(version, S_IRUGO, osst_version_show, NULL);
 
-static int osst_create_driverfs_files(struct device_driver *driverfs)
+static int osst_create_sysfs_files(struct device_driver *sysfs)
 {
-        return driver_create_file(driverfs, &driver_attr_version);
+        return driver_create_file(sysfs, &driver_attr_version);
 }
 
-static void osst_remove_driverfs_files(struct device_driver *driverfs)
+static void osst_remove_sysfs_files(struct device_driver *sysfs)
 {
-        driver_remove_file(driverfs, &driver_attr_version);
+        driver_remove_file(sysfs, &driver_attr_version);
 }
 
 /*
@@ -5953,7 +5953,7 @@ static int __init init_osst(void)
         if (err)
                 goto err_out_chrdev;
 
-        err = osst_create_driverfs_files(&osst_template.gendrv);
+        err = osst_create_sysfs_files(&osst_template.gendrv);
         if (err)
                 goto err_out_scsidrv;
 
@@ -5973,7 +5973,7 @@ static void __exit exit_osst (void)
         int i;
         struct osst_tape * STp;
 
-        osst_remove_driverfs_files(&osst_template.gendrv);
+        osst_remove_sysfs_files(&osst_template.gendrv);
         scsi_unregister_driver(&osst_template.gendrv);
         unregister_chrdev(OSST_MAJOR, "osst");
         osst_sysfs_cleanup();
diff --git a/drivers/scsi/scsi_scan.c b/drivers/scsi/scsi_scan.c
index 6905ffd135b3..0949145304ea 100644
--- a/drivers/scsi/scsi_scan.c
+++ b/drivers/scsi/scsi_scan.c
@@ -54,7 +54,7 @@
 #define SCSI_TIMEOUT (2*HZ)
 
 /*
- * Prefix values for the SCSI id's (stored in driverfs name field)
+ * Prefix values for the SCSI id's (stored in sysfs name field)
  */
 #define SCSI_UID_SER_NUM 'S'
 #define SCSI_UID_UNKNOWN 'Z'
diff --git a/drivers/scsi/scsi_transport_fc.c b/drivers/scsi/scsi_transport_fc.c
index 0d3c10f2134c..58afdb401703 100644
--- a/drivers/scsi/scsi_transport_fc.c
+++ b/drivers/scsi/scsi_transport_fc.c
@@ -855,7 +855,7 @@ static FC_CLASS_DEVICE_ATTR(rport, fast_io_fail_tmo, S_IRUGO | S_IWUSR,
 
 /*
  * Note: in the target show function we recognize when the remote
- *  port is in the heirarchy and do not allow the driver to get
+ *  port is in the hierarchy and do not allow the driver to get
  *  involved in sysfs functions. The driver only gets involved if
  *  it's the "old" style that doesn't use rports.
  */
diff --git a/drivers/scsi/scsi_transport_sas.c b/drivers/scsi/scsi_transport_sas.c
index 6d39150e205b..b2ef71a86292 100644
--- a/drivers/scsi/scsi_transport_sas.c
+++ b/drivers/scsi/scsi_transport_sas.c
@@ -500,7 +500,7 @@ struct sas_phy *sas_phy_alloc(struct device *parent, int number)
 EXPORT_SYMBOL(sas_phy_alloc);
 
 /**
- * sas_phy_add  --  add a SAS PHY to the device hierachy
+ * sas_phy_add  --  add a SAS PHY to the device hierarchy
  * @phy:        The PHY to be added
  *
  * Publishes a SAS PHY to the rest of the system.
@@ -1265,7 +1265,7 @@ struct sas_rphy *sas_expander_alloc(struct sas_port *parent,
 EXPORT_SYMBOL(sas_expander_alloc);
 
 /**
- * sas_rphy_add  --  add a SAS remote PHY to the device hierachy
+ * sas_rphy_add  --  add a SAS remote PHY to the device hierarchy
  * @rphy:       The remote PHY to be added
  *
  * Publishes a SAS remote PHY to the rest of the system.
diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 3f048bd6326d..5a8f55fea5ff 100644
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -1269,9 +1269,18 @@ repeat:
 
         /* Some devices return the total number of sectors, not the
          * highest sector number.  Make the necessary adjustment. */
-        if (sdp->fix_capacity)
+        if (sdp->fix_capacity) {
                 --sdkp->capacity;
 
+        /* Some devices have version which report the correct sizes
+         * and others which do not. We guess size according to a heuristic
+         * and err on the side of lowering the capacity. */
+        } else {
+                if (sdp->guess_capacity)
+                        if (sdkp->capacity & 0x01) /* odd sizes are odd */
+                                --sdkp->capacity;
+        }
+
 got_data:
         if (sector_size == 0) {
                 sector_size = 512;
diff --git a/drivers/scsi/st.c b/drivers/scsi/st.c
index 3d2e02381e92..98d8411bbccc 100644
--- a/drivers/scsi/st.c
+++ b/drivers/scsi/st.c
@@ -195,8 +195,8 @@ static int sgl_unmap_user_pages(struct scatterlist *, const unsigned int, int);
 static int st_probe(struct device *);
 static int st_remove(struct device *);
 
-static int do_create_driverfs_files(void);
-static void do_remove_driverfs_files(void);
+static int do_create_sysfs_files(void);
+static void do_remove_sysfs_files(void);
 static int do_create_class_files(struct scsi_tape *, int, int);
 
 static struct scsi_driver st_template = {
@@ -4193,7 +4193,7 @@ static int __init init_st(void)
         if (err)
                 goto err_chrdev;
 
-        err = do_create_driverfs_files();
+        err = do_create_sysfs_files();
         if (err)
                 goto err_scsidrv;
 
@@ -4211,7 +4211,7 @@ err_class:
 
 static void __exit exit_st(void)
 {
-        do_remove_driverfs_files();
+        do_remove_sysfs_files();
         scsi_unregister_driver(&st_template.gendrv);
         unregister_chrdev_region(MKDEV(SCSI_TAPE_MAJOR, 0),
                                  ST_MAX_TAPE_ENTRIES);
@@ -4249,43 +4249,43 @@ static ssize_t st_version_show(struct device_driver *ddd, char *buf)
 }
 static DRIVER_ATTR(version, S_IRUGO, st_version_show, NULL);
 
-static int do_create_driverfs_files(void)
+static int do_create_sysfs_files(void)
 {
-        struct device_driver *driverfs = &st_template.gendrv;
+        struct device_driver *sysfs = &st_template.gendrv;
         int err;
 
-        err = driver_create_file(driverfs, &driver_attr_try_direct_io);
+        err = driver_create_file(sysfs, &driver_attr_try_direct_io);
         if (err)
                 return err;
-        err = driver_create_file(driverfs, &driver_attr_fixed_buffer_size);
+        err = driver_create_file(sysfs, &driver_attr_fixed_buffer_size);
         if (err)
                 goto err_try_direct_io;
-        err = driver_create_file(driverfs, &driver_attr_max_sg_segs);
+        err = driver_create_file(sysfs, &driver_attr_max_sg_segs);
         if (err)
                 goto err_attr_fixed_buf;
-        err = driver_create_file(driverfs, &driver_attr_version);
+        err = driver_create_file(sysfs, &driver_attr_version);
         if (err)
                 goto err_attr_max_sg;
 
         return 0;
 
 err_attr_max_sg:
-        driver_remove_file(driverfs, &driver_attr_max_sg_segs);
+        driver_remove_file(sysfs, &driver_attr_max_sg_segs);
 err_attr_fixed_buf:
-        driver_remove_file(driverfs, &driver_attr_fixed_buffer_size);
+        driver_remove_file(sysfs, &driver_attr_fixed_buffer_size);
 err_try_direct_io:
-        driver_remove_file(driverfs, &driver_attr_try_direct_io);
+        driver_remove_file(sysfs, &driver_attr_try_direct_io);
         return err;
 }
 
-static void do_remove_driverfs_files(void)
+static void do_remove_sysfs_files(void)
 {
-        struct device_driver *driverfs = &st_template.gendrv;
+        struct device_driver *sysfs = &st_template.gendrv;
 
-        driver_remove_file(driverfs, &driver_attr_version);
-        driver_remove_file(driverfs, &driver_attr_max_sg_segs);
-        driver_remove_file(driverfs, &driver_attr_fixed_buffer_size);
-        driver_remove_file(driverfs, &driver_attr_try_direct_io);
+        driver_remove_file(sysfs, &driver_attr_version);
+        driver_remove_file(sysfs, &driver_attr_max_sg_segs);
+        driver_remove_file(sysfs, &driver_attr_fixed_buffer_size);
+        driver_remove_file(sysfs, &driver_attr_try_direct_io);
 }
 
 
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw1.h b/drivers/scsi/sym53c8xx_2/sym_fw1.h
index 7b39f4a35e98..7b08d6caaa99 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw1.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw1.h
@@ -1020,7 +1020,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
          *  It shall be a tagged command.
          *  Read SIMPLE+TAG.
          *  The C code will deal with errors.
-         *  Agressive optimization, is'nt it? :)
+         *  Aggressive optimization, isn't it? :)
          */
         SCR_MOVE_ABS (2) ^ SCR_MSG_IN,
                 HADDR_1 (msgin),
@@ -1044,7 +1044,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
                 RADDR_1 (dsa),
         /*
          *  The SIDL still contains the TAG value.
-         *  Agressive optimization, isn't it? :):)
+         *  Aggressive optimization, isn't it? :):)
          */
         SCR_REG_SFBR (sidl, SCR_SHL, 0),
                 0,
diff --git a/drivers/scsi/sym53c8xx_2/sym_fw2.h b/drivers/scsi/sym53c8xx_2/sym_fw2.h
index 851f2706f220..6e5b952312e3 100644
--- a/drivers/scsi/sym53c8xx_2/sym_fw2.h
+++ b/drivers/scsi/sym53c8xx_2/sym_fw2.h
@@ -956,7 +956,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
          *  It shall be a tagged command.
          *  Read SIMPLE+TAG.
          *  The C code will deal with errors.
-         *  Agressive optimization, is'nt it? :)
+         *  Aggressive optimization, isn't it? :)
          */
         SCR_MOVE_ABS (2) ^ SCR_MSG_IN,
                 HADDR_1 (msgin),
@@ -968,7 +968,7 @@ static struct SYM_FWA_SCR SYM_FWA_SCR = {
                 offsetof(struct sym_lcb, head.itlq_tbl_sa),
         /*
          *  The SIDL still contains the TAG value.
-         *  Agressive optimization, isn't it? :):)
+         *  Aggressive optimization, isn't it? :):)
          */
         SCR_REG_SFBR (sidl, SCR_SHL, 0),
                 0,