cxgb{3,4}*: improve Kconfig dependencies
[linux-2.6.git] / drivers / scsi / sd.c
index a494a2e..e567302 100644 (file)
 #include <linux/delay.h>
 #include <linux/mutex.h>
 #include <linux/string_helpers.h>
+#include <linux/async.h>
+#include <linux/slab.h>
 #include <asm/uaccess.h>
+#include <asm/unaligned.h>
 
 #include <scsi/scsi.h>
 #include <scsi/scsi_cmnd.h>
@@ -94,6 +97,7 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC);
 #endif
 
 static int  sd_revalidate_disk(struct gendisk *);
+static void sd_unlock_native_capacity(struct gendisk *disk);
 static int  sd_probe(struct device *);
 static int  sd_remove(struct device *);
 static void sd_shutdown(struct device *);
@@ -106,6 +110,7 @@ static void scsi_disk_release(struct device *cdev);
 static void sd_print_sense_hdr(struct scsi_disk *, struct scsi_sense_hdr *);
 static void sd_print_result(struct scsi_disk *, int);
 
+static DEFINE_SPINLOCK(sd_index_lock);
 static DEFINE_IDA(sd_index_ida);
 
 /* This semaphore is used to mediate the 0->1 reference get in the
@@ -113,6 +118,9 @@ static DEFINE_IDA(sd_index_ida);
  * object after last put) */
 static DEFINE_MUTEX(sd_ref_mutex);
 
+static struct kmem_cache *sd_cdb_cache;
+static mempool_t *sd_cdb_pool;
+
 static const char *sd_cache_types[] = {
        "write through", "none", "write back",
        "write back, no read (daft)"
@@ -138,7 +146,7 @@ sd_store_cache_type(struct device *dev, struct device_attribute *attr,
                return -EINVAL;
 
        for (i = 0; i < ARRAY_SIZE(sd_cache_types); i++) {
-               const int len = strlen(sd_cache_types[i]);
+               len = strlen(sd_cache_types[i]);
                if (strncmp(sd_cache_types[i], buf, len) == 0 &&
                    buf[len] == '\n') {
                        ct = i;
@@ -250,6 +258,28 @@ sd_show_protection_type(struct device *dev, struct device_attribute *attr,
 }
 
 static ssize_t
+sd_show_protection_mode(struct device *dev, struct device_attribute *attr,
+                       char *buf)
+{
+       struct scsi_disk *sdkp = to_scsi_disk(dev);
+       struct scsi_device *sdp = sdkp->device;
+       unsigned int dif, dix;
+
+       dif = scsi_host_dif_capable(sdp->host, sdkp->protection_type);
+       dix = scsi_host_dix_capable(sdp->host, sdkp->protection_type);
+
+       if (!dix && scsi_host_dix_capable(sdp->host, SD_DIF_TYPE0_PROTECTION)) {
+               dif = 0;
+               dix = 1;
+       }
+
+       if (!dif && !dix)
+               return snprintf(buf, 20, "none\n");
+
+       return snprintf(buf, 20, "%s%u\n", dix ? "dix" : "dif", dif);
+}
+
+static ssize_t
 sd_show_app_tag_own(struct device *dev, struct device_attribute *attr,
                    char *buf)
 {
@@ -258,6 +288,15 @@ sd_show_app_tag_own(struct device *dev, struct device_attribute *attr,
        return snprintf(buf, 20, "%u\n", sdkp->ATO);
 }
 
+static ssize_t
+sd_show_thin_provisioning(struct device *dev, struct device_attribute *attr,
+                         char *buf)
+{
+       struct scsi_disk *sdkp = to_scsi_disk(dev);
+
+       return snprintf(buf, 20, "%u\n", sdkp->thin_provisioning);
+}
+
 static struct device_attribute sd_disk_attrs[] = {
        __ATTR(cache_type, S_IRUGO|S_IWUSR, sd_show_cache_type,
               sd_store_cache_type),
@@ -267,7 +306,9 @@ static struct device_attribute sd_disk_attrs[] = {
        __ATTR(manage_start_stop, S_IRUGO|S_IWUSR, sd_show_manage_start_stop,
               sd_store_manage_start_stop),
        __ATTR(protection_type, S_IRUGO, sd_show_protection_type, NULL),
+       __ATTR(protection_mode, S_IRUGO, sd_show_protection_mode, NULL),
        __ATTR(app_tag_own, S_IRUGO, sd_show_app_tag_own, NULL),
+       __ATTR(thin_provisioning, S_IRUGO, sd_show_thin_provisioning, NULL),
        __ATTR_NULL,
 };
 
@@ -367,6 +408,113 @@ static void scsi_disk_put(struct scsi_disk *sdkp)
        mutex_unlock(&sd_ref_mutex);
 }
 
+static void sd_prot_op(struct scsi_cmnd *scmd, unsigned int dif)
+{
+       unsigned int prot_op = SCSI_PROT_NORMAL;
+       unsigned int dix = scsi_prot_sg_count(scmd);
+
+       if (scmd->sc_data_direction == DMA_FROM_DEVICE) {
+               if (dif && dix)
+                       prot_op = SCSI_PROT_READ_PASS;
+               else if (dif && !dix)
+                       prot_op = SCSI_PROT_READ_STRIP;
+               else if (!dif && dix)
+                       prot_op = SCSI_PROT_READ_INSERT;
+       } else {
+               if (dif && dix)
+                       prot_op = SCSI_PROT_WRITE_PASS;
+               else if (dif && !dix)
+                       prot_op = SCSI_PROT_WRITE_INSERT;
+               else if (!dif && dix)
+                       prot_op = SCSI_PROT_WRITE_STRIP;
+       }
+
+       scsi_set_prot_op(scmd, prot_op);
+       scsi_set_prot_type(scmd, dif);
+}
+
+/**
+ * scsi_setup_discard_cmnd - unmap blocks on thinly provisioned device
+ * @sdp: scsi device to operate one
+ * @rq: Request to prepare
+ *
+ * Will issue either UNMAP or WRITE SAME(16) depending on preference
+ * indicated by target device.
+ **/
+static int scsi_setup_discard_cmnd(struct scsi_device *sdp, struct request *rq)
+{
+       struct scsi_disk *sdkp = scsi_disk(rq->rq_disk);
+       struct bio *bio = rq->bio;
+       sector_t sector = bio->bi_sector;
+       unsigned int nr_sectors = bio_sectors(bio);
+       unsigned int len;
+       int ret;
+       struct page *page;
+
+       if (sdkp->device->sector_size == 4096) {
+               sector >>= 3;
+               nr_sectors >>= 3;
+       }
+
+       rq->timeout = SD_TIMEOUT;
+
+       memset(rq->cmd, 0, rq->cmd_len);
+
+       page = alloc_page(GFP_ATOMIC | __GFP_ZERO);
+       if (!page)
+               return BLKPREP_DEFER;
+
+       if (sdkp->unmap) {
+               char *buf = page_address(page);
+
+               rq->cmd_len = 10;
+               rq->cmd[0] = UNMAP;
+               rq->cmd[8] = 24;
+
+               put_unaligned_be16(6 + 16, &buf[0]);
+               put_unaligned_be16(16, &buf[2]);
+               put_unaligned_be64(sector, &buf[8]);
+               put_unaligned_be32(nr_sectors, &buf[16]);
+
+               len = 24;
+       } else {
+               rq->cmd_len = 16;
+               rq->cmd[0] = WRITE_SAME_16;
+               rq->cmd[1] = 0x8; /* UNMAP */
+               put_unaligned_be64(sector, &rq->cmd[2]);
+               put_unaligned_be32(nr_sectors, &rq->cmd[10]);
+
+               len = sdkp->device->sector_size;
+       }
+
+       blk_add_request_payload(rq, page, len);
+       ret = scsi_setup_blk_pc_cmnd(sdp, rq);
+       rq->buffer = page_address(page);
+       if (ret != BLKPREP_OK) {
+               __free_page(page);
+               rq->buffer = NULL;
+       }
+       return ret;
+}
+
+static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq)
+{
+       rq->timeout = SD_FLUSH_TIMEOUT;
+       rq->retries = SD_MAX_RETRIES;
+       rq->cmd[0] = SYNCHRONIZE_CACHE;
+       rq->cmd_len = 10;
+
+       return scsi_setup_blk_pc_cmnd(sdp, rq);
+}
+
+static void sd_unprep_fn(struct request_queue *q, struct request *rq)
+{
+       if (rq->cmd_flags & REQ_DISCARD) {
+               free_page((unsigned long)rq->buffer);
+               rq->buffer = NULL;
+       }
+}
+
 /**
  *     sd_init_command - build a scsi (read or write) command from
  *     information in the request structure.
@@ -381,12 +529,23 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
        struct scsi_device *sdp = q->queuedata;
        struct gendisk *disk = rq->rq_disk;
        struct scsi_disk *sdkp;
-       sector_t block = rq->sector;
+       sector_t block = blk_rq_pos(rq);
        sector_t threshold;
-       unsigned int this_count = rq->nr_sectors;
+       unsigned int this_count = blk_rq_sectors(rq);
        int ret, host_dif;
+       unsigned char protect;
 
-       if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
+       /*
+        * Discard request come in as REQ_TYPE_FS but we turn them into
+        * block PC requests to make life easier.
+        */
+       if (rq->cmd_flags & REQ_DISCARD) {
+               ret = scsi_setup_discard_cmnd(sdp, rq);
+               goto out;
+       } else if (rq->cmd_flags & REQ_FLUSH) {
+               ret = scsi_setup_flush_cmnd(sdp, rq);
+               goto out;
+       } else if (rq->cmd_type == REQ_TYPE_BLOCK_PC) {
                ret = scsi_setup_blk_pc_cmnd(sdp, rq);
                goto out;
        } else if (rq->cmd_type != REQ_TYPE_FS) {
@@ -410,10 +569,10 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                                        this_count));
 
        if (!sdp || !scsi_device_online(sdp) ||
-           block + rq->nr_sectors > get_capacity(disk)) {
+           block + blk_rq_sectors(rq) > get_capacity(disk)) {
                SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
-                                               "Finishing %ld sectors\n",
-                                               rq->nr_sectors));
+                                               "Finishing %u sectors\n",
+                                               blk_rq_sectors(rq)));
                SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
                                                "Retry with 0x%p\n", SCpnt));
                goto out;
@@ -424,7 +583,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                 * quietly refuse to do anything to a changed disc until 
                 * the changed bit has been reset
                 */
-               /* printk("SCSI disk has been changed. Prohibiting further I/O.\n"); */
+               /* printk("SCSI disk has been changed or is not present. Prohibiting further I/O.\n"); */
                goto out;
        }
 
@@ -460,7 +619,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         * for this.
         */
        if (sdp->sector_size == 1024) {
-               if ((block & 1) || (rq->nr_sectors & 1)) {
+               if ((block & 1) || (blk_rq_sectors(rq) & 1)) {
                        scmd_printk(KERN_ERR, SCpnt,
                                    "Bad block number requested\n");
                        goto out;
@@ -470,7 +629,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                }
        }
        if (sdp->sector_size == 2048) {
-               if ((block & 3) || (rq->nr_sectors & 3)) {
+               if ((block & 3) || (blk_rq_sectors(rq) & 3)) {
                        scmd_printk(KERN_ERR, SCpnt,
                                    "Bad block number requested\n");
                        goto out;
@@ -480,7 +639,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                }
        }
        if (sdp->sector_size == 4096) {
-               if ((block & 7) || (rq->nr_sectors & 7)) {
+               if ((block & 7) || (blk_rq_sectors(rq) & 7)) {
                        scmd_printk(KERN_ERR, SCpnt,
                                    "Bad block number requested\n");
                        goto out;
@@ -509,21 +668,57 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
        }
 
        SCSI_LOG_HLQUEUE(2, scmd_printk(KERN_INFO, SCpnt,
-                                       "%s %d/%ld 512 byte blocks.\n",
+                                       "%s %d/%u 512 byte blocks.\n",
                                        (rq_data_dir(rq) == WRITE) ?
                                        "writing" : "reading", this_count,
-                                       rq->nr_sectors));
+                                       blk_rq_sectors(rq)));
 
        /* Set RDPROTECT/WRPROTECT if disk is formatted with DIF */
        host_dif = scsi_host_dif_capable(sdp->host, sdkp->protection_type);
        if (host_dif)
-               SCpnt->cmnd[1] = 1 << 5;
+               protect = 1 << 5;
        else
-               SCpnt->cmnd[1] = 0;
+               protect = 0;
 
-       if (block > 0xffffffff) {
+       if (host_dif == SD_DIF_TYPE2_PROTECTION) {
+               SCpnt->cmnd = mempool_alloc(sd_cdb_pool, GFP_ATOMIC);
+
+               if (unlikely(SCpnt->cmnd == NULL)) {
+                       ret = BLKPREP_DEFER;
+                       goto out;
+               }
+
+               SCpnt->cmd_len = SD_EXT_CDB_SIZE;
+               memset(SCpnt->cmnd, 0, SCpnt->cmd_len);
+               SCpnt->cmnd[0] = VARIABLE_LENGTH_CMD;
+               SCpnt->cmnd[7] = 0x18;
+               SCpnt->cmnd[9] = (rq_data_dir(rq) == READ) ? READ_32 : WRITE_32;
+               SCpnt->cmnd[10] = protect | ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0);
+
+               /* LBA */
+               SCpnt->cmnd[12] = sizeof(block) > 4 ? (unsigned char) (block >> 56) & 0xff : 0;
+               SCpnt->cmnd[13] = sizeof(block) > 4 ? (unsigned char) (block >> 48) & 0xff : 0;
+               SCpnt->cmnd[14] = sizeof(block) > 4 ? (unsigned char) (block >> 40) & 0xff : 0;
+               SCpnt->cmnd[15] = sizeof(block) > 4 ? (unsigned char) (block >> 32) & 0xff : 0;
+               SCpnt->cmnd[16] = (unsigned char) (block >> 24) & 0xff;
+               SCpnt->cmnd[17] = (unsigned char) (block >> 16) & 0xff;
+               SCpnt->cmnd[18] = (unsigned char) (block >> 8) & 0xff;
+               SCpnt->cmnd[19] = (unsigned char) block & 0xff;
+
+               /* Expected Indirect LBA */
+               SCpnt->cmnd[20] = (unsigned char) (block >> 24) & 0xff;
+               SCpnt->cmnd[21] = (unsigned char) (block >> 16) & 0xff;
+               SCpnt->cmnd[22] = (unsigned char) (block >> 8) & 0xff;
+               SCpnt->cmnd[23] = (unsigned char) block & 0xff;
+
+               /* Transfer length */
+               SCpnt->cmnd[28] = (unsigned char) (this_count >> 24) & 0xff;
+               SCpnt->cmnd[29] = (unsigned char) (this_count >> 16) & 0xff;
+               SCpnt->cmnd[30] = (unsigned char) (this_count >> 8) & 0xff;
+               SCpnt->cmnd[31] = (unsigned char) this_count & 0xff;
+       } else if (block > 0xffffffff) {
                SCpnt->cmnd[0] += READ_16 - READ_6;
-               SCpnt->cmnd[1] |= blk_fua_rq(rq) ? 0x8 : 0;
+               SCpnt->cmnd[1] = protect | ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0);
                SCpnt->cmnd[2] = sizeof(block) > 4 ? (unsigned char) (block >> 56) & 0xff : 0;
                SCpnt->cmnd[3] = sizeof(block) > 4 ? (unsigned char) (block >> 48) & 0xff : 0;
                SCpnt->cmnd[4] = sizeof(block) > 4 ? (unsigned char) (block >> 40) & 0xff : 0;
@@ -544,7 +739,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                        this_count = 0xffff;
 
                SCpnt->cmnd[0] += READ_10 - READ_6;
-               SCpnt->cmnd[1] |= blk_fua_rq(rq) ? 0x8 : 0;
+               SCpnt->cmnd[1] = protect | ((rq->cmd_flags & REQ_FUA) ? 0x8 : 0);
                SCpnt->cmnd[2] = (unsigned char) (block >> 24) & 0xff;
                SCpnt->cmnd[3] = (unsigned char) (block >> 16) & 0xff;
                SCpnt->cmnd[4] = (unsigned char) (block >> 8) & 0xff;
@@ -553,7 +748,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
                SCpnt->cmnd[7] = (unsigned char) (this_count >> 8) & 0xff;
                SCpnt->cmnd[8] = (unsigned char) this_count & 0xff;
        } else {
-               if (unlikely(blk_fua_rq(rq))) {
+               if (unlikely(rq->cmd_flags & REQ_FUA)) {
                        /*
                         * This happens only if this drive failed
                         * 10byte rw command with ILLEGAL_REQUEST
@@ -575,7 +770,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
 
        /* If DIF or DIX is enabled, tell HBA how to handle request */
        if (host_dif || scsi_prot_sg_count(SCpnt))
-               sd_dif_op(SCpnt, sdkp->protection_type, scsi_prot_sg_count(SCpnt));
+               sd_prot_op(SCpnt, host_dif);
 
        /*
         * We shouldn't disconnect in the middle of a sector, so with a dumb
@@ -607,22 +802,26 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
  *     or from within the kernel (e.g. as a result of a mount(1) ).
  *     In the latter case @inode and @filp carry an abridged amount
  *     of information as noted above.
+ *
+ *     Locking: called with bdev->bd_mutex held.
  **/
-static int sd_open(struct inode *inode, struct file *filp)
+static int sd_open(struct block_device *bdev, fmode_t mode)
 {
-       struct gendisk *disk = inode->i_bdev->bd_disk;
-       struct scsi_disk *sdkp;
+       struct scsi_disk *sdkp = scsi_disk_get(bdev->bd_disk);
        struct scsi_device *sdev;
        int retval;
 
-       if (!(sdkp = scsi_disk_get(disk)))
+       if (!sdkp)
                return -ENXIO;
 
-
        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_open\n"));
 
        sdev = sdkp->device;
 
+       retval = scsi_autopm_get_device(sdev);
+       if (retval)
+               goto error_autopm;
+
        /*
         * If the device is in error recovery, wait until it is done.
         * If the device is offline, then disallow any access to it.
@@ -632,14 +831,13 @@ static int sd_open(struct inode *inode, struct file *filp)
                goto error_out;
 
        if (sdev->removable || sdkp->write_prot)
-               check_disk_change(inode->i_bdev);
+               check_disk_change(bdev);
 
        /*
         * If the drive is empty, just let the open fail.
         */
        retval = -ENOMEDIUM;
-       if (sdev->removable && !sdkp->media_present &&
-           !(filp->f_flags & O_NDELAY))
+       if (sdev->removable && !sdkp->media_present && !(mode & FMODE_NDELAY))
                goto error_out;
 
        /*
@@ -647,7 +845,7 @@ static int sd_open(struct inode *inode, struct file *filp)
         * if the user expects to be able to write to the thing.
         */
        retval = -EROFS;
-       if (sdkp->write_prot && (filp->f_mode & FMODE_WRITE))
+       if (sdkp->write_prot && (mode & FMODE_WRITE))
                goto error_out;
 
        /*
@@ -660,7 +858,7 @@ static int sd_open(struct inode *inode, struct file *filp)
        if (!scsi_device_online(sdev))
                goto error_out;
 
-       if (!sdkp->openers++ && sdev->removable) {
+       if ((atomic_inc_return(&sdkp->openers) == 1) && sdev->removable) {
                if (scsi_block_when_processing_errors(sdev))
                        scsi_set_medium_removal(sdev, SCSI_REMOVAL_PREVENT);
        }
@@ -668,6 +866,8 @@ static int sd_open(struct inode *inode, struct file *filp)
        return 0;
 
 error_out:
+       scsi_autopm_put_device(sdev);
+error_autopm:
        scsi_disk_put(sdkp);
        return retval;  
 }
@@ -682,16 +882,17 @@ error_out:
  *
  *     Note: may block (uninterruptible) if error recovery is underway
  *     on this disk.
+ *
+ *     Locking: called with bdev->bd_mutex held.
  **/
-static int sd_release(struct inode *inode, struct file *filp)
+static int sd_release(struct gendisk *disk, fmode_t mode)
 {
-       struct gendisk *disk = inode->i_bdev->bd_disk;
        struct scsi_disk *sdkp = scsi_disk(disk);
        struct scsi_device *sdev = sdkp->device;
 
        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_release\n"));
 
-       if (!--sdkp->openers && sdev->removable) {
+       if (atomic_dec_return(&sdkp->openers) == 0 && sdev->removable) {
                if (scsi_block_when_processing_errors(sdev))
                        scsi_set_medium_removal(sdev, SCSI_REMOVAL_ALLOW);
        }
@@ -700,6 +901,8 @@ static int sd_release(struct inode *inode, struct file *filp)
         * XXX and what if there are packets in flight and this close()
         * XXX is followed by a "rmmod sd_mod"?
         */
+
+       scsi_autopm_put_device(sdev);
        scsi_disk_put(sdkp);
        return 0;
 }
@@ -742,10 +945,9 @@ static int sd_getgeo(struct block_device *bdev, struct hd_geometry *geo)
  *     Note: most ioctls are forward onto the block subsystem or further
  *     down in the scsi subsystem.
  **/
-static int sd_ioctl(struct inode * inode, struct file * filp, 
+static int sd_ioctl(struct block_device *bdev, fmode_t mode,
                    unsigned int cmd, unsigned long arg)
 {
-       struct block_device *bdev = inode->i_bdev;
        struct gendisk *disk = bdev->bd_disk;
        struct scsi_device *sdp = scsi_disk(disk)->device;
        void __user *p = (void __user *)arg;
@@ -760,9 +962,10 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
         * may try and take the device offline, in which case all further
         * access to the device is prohibited.
         */
-       error = scsi_nonblockable_ioctl(sdp, cmd, p, filp);
+       error = scsi_nonblockable_ioctl(sdp, cmd, p,
+                                       (mode & FMODE_NDELAY) != 0);
        if (!scsi_block_when_processing_errors(sdp) || !error)
-               return error;
+               goto out;
 
        /*
         * Send SCSI addressing ioctls directly to mid level, send other
@@ -772,41 +975,66 @@ static int sd_ioctl(struct inode * inode, struct file * filp,
        switch (cmd) {
                case SCSI_IOCTL_GET_IDLUN:
                case SCSI_IOCTL_GET_BUS_NUMBER:
-                       return scsi_ioctl(sdp, cmd, p);
+                       error = scsi_ioctl(sdp, cmd, p);
+                       break;
                default:
-                       error = scsi_cmd_ioctl(filp, disk->queue, disk, cmd, p);
+                       error = scsi_cmd_ioctl(disk->queue, disk, mode, cmd, p);
                        if (error != -ENOTTY)
-                               return error;
+                               break;
+                       error = scsi_ioctl(sdp, cmd, p);
+                       break;
        }
-       return scsi_ioctl(sdp, cmd, p);
+out:
+       return error;
 }
 
 static void set_media_not_present(struct scsi_disk *sdkp)
 {
-       sdkp->media_present = 0;
-       sdkp->capacity = 0;
-       sdkp->device->changed = 1;
+       if (sdkp->media_present)
+               sdkp->device->changed = 1;
+
+       if (sdkp->device->removable) {
+               sdkp->media_present = 0;
+               sdkp->capacity = 0;
+       }
+}
+
+static int media_not_present(struct scsi_disk *sdkp,
+                            struct scsi_sense_hdr *sshdr)
+{
+       if (!scsi_sense_valid(sshdr))
+               return 0;
+
+       /* not invoked for commands that could return deferred errors */
+       switch (sshdr->sense_key) {
+       case UNIT_ATTENTION:
+       case NOT_READY:
+               /* medium not present */
+               if (sshdr->asc == 0x3A) {
+                       set_media_not_present(sdkp);
+                       return 1;
+               }
+       }
+       return 0;
 }
 
 /**
- *     sd_media_changed - check if our medium changed
- *     @disk: kernel device descriptor 
+ *     sd_check_events - check media events
+ *     @disk: kernel device descriptor
+ *     @clearing: disk events currently being cleared
  *
- *     Returns 0 if not applicable or no change; 1 if change
+ *     Returns mask of DISK_EVENT_*.
  *
  *     Note: this function is invoked from the block subsystem.
  **/
-static int sd_media_changed(struct gendisk *disk)
+static unsigned int sd_check_events(struct gendisk *disk, unsigned int clearing)
 {
        struct scsi_disk *sdkp = scsi_disk(disk);
        struct scsi_device *sdp = sdkp->device;
        struct scsi_sense_hdr *sshdr = NULL;
        int retval;
 
-       SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_media_changed\n"));
-
-       if (!sdp->removable)
-               return 0;
+       SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp, "sd_check_events\n"));
 
        /*
         * If the device is offline, don't send any commands - just pretend as
@@ -816,7 +1044,6 @@ static int sd_media_changed(struct gendisk *disk)
         */
        if (!scsi_device_online(sdp)) {
                set_media_not_present(sdkp);
-               retval = 1;
                goto out;
        }
 
@@ -837,34 +1064,32 @@ static int sd_media_changed(struct gendisk *disk)
                                              sshdr);
        }
 
-       /*
-        * Unable to test, unit probably not ready.   This usually
-        * means there is no disc in the drive.  Mark as changed,
-        * and we will figure it out later once the drive is
-        * available again.
-        */
-       if (retval || (scsi_sense_valid(sshdr) &&
-                      /* 0x3a is medium not present */
-                      sshdr->asc == 0x3a)) {
+       /* failed to execute TUR, assume media not present */
+       if (host_byte(retval)) {
                set_media_not_present(sdkp);
-               retval = 1;
                goto out;
        }
 
+       if (media_not_present(sdkp, sshdr))
+               goto out;
+
        /*
         * For removable scsi disk we have to recognise the presence
-        * of a disk in the drive. This is kept in the struct scsi_disk
-        * struct and tested at open !  Daniel Roche (dan@lectra.fr)
+        * of a disk in the drive.
         */
+       if (!sdkp->media_present)
+               sdp->changed = 1;
        sdkp->media_present = 1;
-
-       retval = sdp->changed;
-       sdp->changed = 0;
 out:
-       if (retval != sdkp->previous_state)
-               sdev_evt_send_simple(sdp, SDEV_EVT_MEDIA_CHANGE, GFP_KERNEL);
-       sdkp->previous_state = retval;
+       /*
+        * sdp->changed is set under the following conditions:
+        *
+        *      Medium present state has changed in either direction.
+        *      Device has indicated UNIT_ATTENTION.
+        */
        kfree(sshdr);
+       retval = sdp->changed ? DISK_EVENT_MEDIA_CHANGE : 0;
+       sdp->changed = 0;
        return retval;
 }
 
@@ -887,7 +1112,7 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
                 * flush everything.
                 */
                res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
-                                      SD_TIMEOUT, SD_MAX_RETRIES);
+                                      SD_FLUSH_TIMEOUT, SD_MAX_RETRIES, NULL);
                if (res == 0)
                        break;
        }
@@ -903,14 +1128,6 @@ static int sd_sync_cache(struct scsi_disk *sdkp)
        return 0;
 }
 
-static void sd_prepare_flush(struct request_queue *q, struct request *rq)
-{
-       rq->cmd_type = REQ_TYPE_BLOCK_PC;
-       rq->timeout = SD_TIMEOUT;
-       rq->cmd[0] = SYNCHRONIZE_CACHE;
-       rq->cmd_len = 10;
-}
-
 static void sd_rescan(struct device *dev)
 {
        struct scsi_disk *sdkp = scsi_disk_get_from_dev(dev);
@@ -927,11 +1144,10 @@ static void sd_rescan(struct device *dev)
  * This gets directly called from VFS. When the ioctl 
  * is not recognized we go back to the other translation paths. 
  */
-static long sd_compat_ioctl(struct file *file, unsigned int cmd, unsigned long arg)
+static int sd_compat_ioctl(struct block_device *bdev, fmode_t mode,
+                          unsigned int cmd, unsigned long arg)
 {
-       struct block_device *bdev = file->f_path.dentry->d_inode->i_bdev;
-       struct gendisk *disk = bdev->bd_disk;
-       struct scsi_device *sdev = scsi_disk(disk)->device;
+       struct scsi_device *sdev = scsi_disk(bdev->bd_disk)->device;
 
        /*
         * If we are in the middle of error recovery, don't let anyone
@@ -957,7 +1173,7 @@ static long sd_compat_ioctl(struct file *file, unsigned int cmd, unsigned long a
 }
 #endif
 
-static struct block_device_operations sd_fops = {
+static const struct block_device_operations sd_fops = {
        .owner                  = THIS_MODULE,
        .open                   = sd_open,
        .release                = sd_release,
@@ -966,18 +1182,25 @@ static struct block_device_operations sd_fops = {
 #ifdef CONFIG_COMPAT
        .compat_ioctl           = sd_compat_ioctl,
 #endif
-       .media_changed          = sd_media_changed,
+       .check_events           = sd_check_events,
        .revalidate_disk        = sd_revalidate_disk,
+       .unlock_native_capacity = sd_unlock_native_capacity,
 };
 
 static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
 {
-       u64 start_lba = scmd->request->sector;
-       u64 end_lba = scmd->request->sector + (scsi_bufflen(scmd) / 512);
+       u64 start_lba = blk_rq_pos(scmd->request);
+       u64 end_lba = blk_rq_pos(scmd->request) + (scsi_bufflen(scmd) / 512);
        u64 bad_lba;
        int info_valid;
+       /*
+        * resid is optional but mostly filled in.  When it's unused,
+        * its value is zero, so we assume the whole buffer transferred
+        */
+       unsigned int transferred = scsi_bufflen(scmd) - scsi_get_resid(scmd);
+       unsigned int good_bytes;
 
-       if (!blk_fs_request(scmd->request))
+       if (scmd->request->cmd_type != REQ_TYPE_FS)
                return 0;
 
        info_valid = scsi_get_sense_info_fld(scmd->sense_buffer,
@@ -1009,7 +1232,8 @@ static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd)
        /* This computation should always be done in terms of
         * the resolution of the device's medium.
         */
-       return (bad_lba - start_lba) * scmd->device->sector_size;
+       good_bytes = (bad_lba - start_lba) * scmd->device->sector_size;
+       return min(good_bytes, transferred);
 }
 
 /**
@@ -1024,9 +1248,16 @@ static int sd_done(struct scsi_cmnd *SCpnt)
        int result = SCpnt->result;
        unsigned int good_bytes = result ? 0 : scsi_bufflen(SCpnt);
        struct scsi_sense_hdr sshdr;
+       struct scsi_disk *sdkp = scsi_disk(SCpnt->request->rq_disk);
        int sense_valid = 0;
        int sense_deferred = 0;
 
+       if (SCpnt->request->cmd_flags & REQ_DISCARD) {
+               if (!result)
+                       scsi_set_resid(SCpnt, 0);
+               return good_bytes;
+       }
+
        if (result) {
                sense_valid = scsi_command_normalize_sense(SCpnt, &sshdr);
                if (sense_valid)
@@ -1053,37 +1284,21 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                good_bytes = sd_completed_bytes(SCpnt);
                break;
        case RECOVERED_ERROR:
+               good_bytes = scsi_bufflen(SCpnt);
+               break;
        case NO_SENSE:
-               /* Inform the user, but make sure that it's not treated
-                * as a hard error.
+               /* This indicates a false check condition, so ignore it.  An
+                * unknown amount of data was transferred so treat it as an
+                * error.
                 */
                scsi_print_sense("sd", SCpnt);
                SCpnt->result = 0;
                memset(SCpnt->sense_buffer, 0, SCSI_SENSE_BUFFERSIZE);
-               good_bytes = scsi_bufflen(SCpnt);
                break;
-       case ABORTED_COMMAND:
-               if (sshdr.asc == 0x10) { /* DIF: Disk detected corruption */
-                       scsi_print_result(SCpnt);
-                       scsi_print_sense("sd", SCpnt);
+       case ABORTED_COMMAND: /* DIF: Target detected corruption */
+       case ILLEGAL_REQUEST: /* DIX: Host detected corruption */
+               if (sshdr.asc == 0x10)
                        good_bytes = sd_completed_bytes(SCpnt);
-               }
-               break;
-       case ILLEGAL_REQUEST:
-               if (sshdr.asc == 0x10) { /* DIX: HBA detected corruption */
-                       scsi_print_result(SCpnt);
-                       scsi_print_sense("sd", SCpnt);
-                       good_bytes = sd_completed_bytes(SCpnt);
-               }
-               if (!scsi_device_protection(SCpnt->device) &&
-                   SCpnt->device->use_10_for_rw &&
-                   (SCpnt->cmnd[0] == READ_10 ||
-                    SCpnt->cmnd[0] == WRITE_10))
-                       SCpnt->device->use_10_for_rw = 0;
-               if (SCpnt->device->use_10_for_ms &&
-                   (SCpnt->cmnd[0] == MODE_SENSE_10 ||
-                    SCpnt->cmnd[0] == MODE_SELECT_10))
-                       SCpnt->device->use_10_for_ms = 0;
                break;
        default:
                break;
@@ -1092,24 +1307,22 @@ static int sd_done(struct scsi_cmnd *SCpnt)
        if (rq_data_dir(SCpnt->request) == READ && scsi_prot_sg_count(SCpnt))
                sd_dif_complete(SCpnt, good_bytes);
 
-       return good_bytes;
-}
+       if (scsi_host_dif_capable(sdkp->device->host, sdkp->protection_type)
+           == SD_DIF_TYPE2_PROTECTION && SCpnt->cmnd != SCpnt->request->cmd) {
 
-static int media_not_present(struct scsi_disk *sdkp,
-                            struct scsi_sense_hdr *sshdr)
-{
+               /* We have to print a failed command here as the
+                * extended CDB gets freed before scsi_io_completion()
+                * is called.
+                */
+               if (result)
+                       scsi_print_command(SCpnt);
 
-       if (!scsi_sense_valid(sshdr))
-               return 0;
-       /* not invoked for commands that could return deferred errors */
-       if (sshdr->sense_key != NOT_READY &&
-           sshdr->sense_key != UNIT_ATTENTION)
-               return 0;
-       if (sshdr->asc != 0x3A) /* medium not present */
-               return 0;
+               mempool_free(SCpnt->cmnd, sd_cdb_pool);
+               SCpnt->cmnd = NULL;
+               SCpnt->cmd_len = 0;
+       }
 
-       set_media_not_present(sdkp);
-       return 1;
+       return good_bytes;
 }
 
 /*
@@ -1139,7 +1352,7 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                        the_result = scsi_execute_req(sdkp->device, cmd,
                                                      DMA_NONE, NULL, 0,
                                                      &sshdr, SD_TIMEOUT,
-                                                     SD_MAX_RETRIES);
+                                                     SD_MAX_RETRIES, NULL);
 
                        /*
                         * If the drive has indicated to us that it
@@ -1170,23 +1383,19 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                /*
                 * The device does not want the automatic start to be issued.
                 */
-               if (sdkp->device->no_start_on_add) {
+               if (sdkp->device->no_start_on_add)
                        break;
-               }
 
-               /*
-                * If manual intervention is required, or this is an
-                * absent USB storage device, a spinup is meaningless.
-                */
-               if (sense_valid &&
-                   sshdr.sense_key == NOT_READY &&
-                   sshdr.asc == 4 && sshdr.ascq == 3) {
-                       break;          /* manual intervention required */
-
-               /*
-                * Issue command to spin up drive when not ready
-                */
-               } else if (sense_valid && sshdr.sense_key == NOT_READY) {
+               if (sense_valid && sshdr.sense_key == NOT_READY) {
+                       if (sshdr.asc == 4 && sshdr.ascq == 3)
+                               break;  /* manual intervention required */
+                       if (sshdr.asc == 4 && sshdr.ascq == 0xb)
+                               break;  /* standby */
+                       if (sshdr.asc == 4 && sshdr.ascq == 0xc)
+                               break;  /* unavailable */
+                       /*
+                        * Issue command to spin up drive when not ready
+                        */
                        if (!spintime) {
                                sd_printk(KERN_NOTICE, sdkp, "Spinning up disk...");
                                cmd[0] = START_STOP;
@@ -1197,7 +1406,8 @@ sd_spinup_disk(struct scsi_disk *sdkp)
                                        cmd[4] |= 1 << 4;
                                scsi_execute_req(sdkp->device, cmd, DMA_NONE,
                                                 NULL, 0, &sshdr,
-                                                SD_TIMEOUT, SD_MAX_RETRIES);
+                                                SD_TIMEOUT, SD_MAX_RETRIES,
+                                                NULL);
                                spintime_expire = jiffies + 100 * HZ;
                                spintime = 1;
                        }
@@ -1243,164 +1453,303 @@ sd_spinup_disk(struct scsi_disk *sdkp)
 /*
  * Determine whether disk supports Data Integrity Field.
  */
-void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
+static void sd_read_protection_type(struct scsi_disk *sdkp, unsigned char *buffer)
 {
        struct scsi_device *sdp = sdkp->device;
        u8 type;
 
        if (scsi_device_protection(sdp) == 0 || (buffer[12] & 1) == 0)
-               type = 0;
-       else
-               type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */
+               return;
 
-       sdkp->protection_type = type;
+       type = ((buffer[12] >> 1) & 7) + 1; /* P_TYPE 0 = Type 1 */
 
-       switch (type) {
-       case SD_DIF_TYPE0_PROTECTION:
-       case SD_DIF_TYPE1_PROTECTION:
-       case SD_DIF_TYPE3_PROTECTION:
-               break;
+       if (type == sdkp->protection_type || !sdkp->first_scan)
+               return;
 
-       case SD_DIF_TYPE2_PROTECTION:
-               sd_printk(KERN_ERR, sdkp, "formatted with DIF Type 2 "  \
-                         "protection which is currently unsupported. " \
-                         "Disabling disk!\n");
-               goto disable;
+       sdkp->protection_type = type;
 
-       default:
-               sd_printk(KERN_ERR, sdkp, "formatted with unknown "     \
-                         "protection type %d. Disabling disk!\n", type);
-               goto disable;
+       if (type > SD_DIF_TYPE3_PROTECTION) {
+               sd_printk(KERN_ERR, sdkp, "formatted with unsupported " \
+                         "protection type %u. Disabling disk!\n", type);
+               sdkp->capacity = 0;
+               return;
        }
 
-       return;
+       if (scsi_host_dif_capable(sdp->host, type))
+               sd_printk(KERN_NOTICE, sdkp,
+                         "Enabling DIF Type %u protection\n", type);
+       else
+               sd_printk(KERN_NOTICE, sdkp,
+                         "Disabling DIF Type %u protection\n", type);
+}
 
-disable:
-       sdkp->capacity = 0;
+static void read_capacity_error(struct scsi_disk *sdkp, struct scsi_device *sdp,
+                       struct scsi_sense_hdr *sshdr, int sense_valid,
+                       int the_result)
+{
+       sd_print_result(sdkp, the_result);
+       if (driver_byte(the_result) & DRIVER_SENSE)
+               sd_print_sense_hdr(sdkp, sshdr);
+       else
+               sd_printk(KERN_NOTICE, sdkp, "Sense not available.\n");
+
+       /*
+        * Set dirty bit for removable devices if not ready -
+        * sometimes drives will not report this properly.
+        */
+       if (sdp->removable &&
+           sense_valid && sshdr->sense_key == NOT_READY)
+               set_media_not_present(sdkp);
+
+       /*
+        * We used to set media_present to 0 here to indicate no media
+        * in the drive, but some drives fail read capacity even with
+        * media present, so we can't do that.
+        */
+       sdkp->capacity = 0; /* unknown mapped to zero - as usual */
 }
 
-/*
- * read disk capacity
- */
-static void
-sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer)
+#define RC16_LEN 32
+#if RC16_LEN > SD_BUF_SIZE
+#error RC16_LEN must not be more than SD_BUF_SIZE
+#endif
+
+#define READ_CAPACITY_RETRIES_ON_RESET 10
+
+static int read_capacity_16(struct scsi_disk *sdkp, struct scsi_device *sdp,
+                                               unsigned char *buffer)
 {
        unsigned char cmd[16];
-       int the_result, retries;
-       int sector_size = 0;
-       /* Force READ CAPACITY(16) when PROTECT=1 */
-       int longrc = scsi_device_protection(sdkp->device) ? 1 : 0;
        struct scsi_sense_hdr sshdr;
        int sense_valid = 0;
-       struct scsi_device *sdp = sdkp->device;
+       int the_result;
+       int retries = 3, reset_retries = READ_CAPACITY_RETRIES_ON_RESET;
+       unsigned int alignment;
+       unsigned long long lba;
+       unsigned sector_size;
+
+       if (sdp->no_read_capacity_16)
+               return -EINVAL;
 
-repeat:
-       retries = 3;
        do {
-               if (longrc) {
-                       memset((void *) cmd, 0, 16);
-                       cmd[0] = SERVICE_ACTION_IN;
-                       cmd[1] = SAI_READ_CAPACITY_16;
-                       cmd[13] = 13;
-                       memset((void *) buffer, 0, 13);
-               } else {
-                       cmd[0] = READ_CAPACITY;
-                       memset((void *) &cmd[1], 0, 9);
-                       memset((void *) buffer, 0, 8);
+               memset(cmd, 0, 16);
+               cmd[0] = SERVICE_ACTION_IN;
+               cmd[1] = SAI_READ_CAPACITY_16;
+               cmd[13] = RC16_LEN;
+               memset(buffer, 0, RC16_LEN);
+
+               the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
+                                       buffer, RC16_LEN, &sshdr,
+                                       SD_TIMEOUT, SD_MAX_RETRIES, NULL);
+
+               if (media_not_present(sdkp, &sshdr))
+                       return -ENODEV;
+
+               if (the_result) {
+                       sense_valid = scsi_sense_valid(&sshdr);
+                       if (sense_valid &&
+                           sshdr.sense_key == ILLEGAL_REQUEST &&
+                           (sshdr.asc == 0x20 || sshdr.asc == 0x24) &&
+                           sshdr.ascq == 0x00)
+                               /* Invalid Command Operation Code or
+                                * Invalid Field in CDB, just retry
+                                * silently with RC10 */
+                               return -EINVAL;
+                       if (sense_valid &&
+                           sshdr.sense_key == UNIT_ATTENTION &&
+                           sshdr.asc == 0x29 && sshdr.ascq == 0x00)
+                               /* Device reset might occur several times,
+                                * give it one more chance */
+                               if (--reset_retries > 0)
+                                       continue;
                }
-               
+               retries--;
+
+       } while (the_result && retries);
+
+       if (the_result) {
+               sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY(16) failed\n");
+               read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
+               return -EINVAL;
+       }
+
+       sector_size = get_unaligned_be32(&buffer[8]);
+       lba = get_unaligned_be64(&buffer[0]);
+
+       sd_read_protection_type(sdkp, buffer);
+
+       if ((sizeof(sdkp->capacity) == 4) && (lba >= 0xffffffffULL)) {
+               sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
+                       "kernel compiled with support for large block "
+                       "devices.\n");
+               sdkp->capacity = 0;
+               return -EOVERFLOW;
+       }
+
+       /* Logical blocks per physical block exponent */
+       sdkp->physical_block_size = (1 << (buffer[13] & 0xf)) * sector_size;
+
+       /* Lowest aligned logical block */
+       alignment = ((buffer[14] & 0x3f) << 8 | buffer[15]) * sector_size;
+       blk_queue_alignment_offset(sdp->request_queue, alignment);
+       if (alignment && sdkp->first_scan)
+               sd_printk(KERN_NOTICE, sdkp,
+                         "physical block alignment offset: %u\n", alignment);
+
+       if (buffer[14] & 0x80) { /* TPE */
+               struct request_queue *q = sdp->request_queue;
+
+               sdkp->thin_provisioning = 1;
+               q->limits.discard_granularity = sdkp->physical_block_size;
+               q->limits.max_discard_sectors = 0xffffffff;
+
+               if (buffer[14] & 0x40) /* TPRZ */
+                       q->limits.discard_zeroes_data = 1;
+
+               queue_flag_set_unlocked(QUEUE_FLAG_DISCARD, q);
+       }
+
+       sdkp->capacity = lba + 1;
+       return sector_size;
+}
+
+static int read_capacity_10(struct scsi_disk *sdkp, struct scsi_device *sdp,
+                                               unsigned char *buffer)
+{
+       unsigned char cmd[16];
+       struct scsi_sense_hdr sshdr;
+       int sense_valid = 0;
+       int the_result;
+       int retries = 3, reset_retries = READ_CAPACITY_RETRIES_ON_RESET;
+       sector_t lba;
+       unsigned sector_size;
+
+       do {
+               cmd[0] = READ_CAPACITY;
+               memset(&cmd[1], 0, 9);
+               memset(buffer, 0, 8);
+
                the_result = scsi_execute_req(sdp, cmd, DMA_FROM_DEVICE,
-                                             buffer, longrc ? 13 : 8, &sshdr,
-                                             SD_TIMEOUT, SD_MAX_RETRIES);
+                                       buffer, 8, &sshdr,
+                                       SD_TIMEOUT, SD_MAX_RETRIES, NULL);
 
                if (media_not_present(sdkp, &sshdr))
-                       return;
+                       return -ENODEV;
 
-               if (the_result)
+               if (the_result) {
                        sense_valid = scsi_sense_valid(&sshdr);
+                       if (sense_valid &&
+                           sshdr.sense_key == UNIT_ATTENTION &&
+                           sshdr.asc == 0x29 && sshdr.ascq == 0x00)
+                               /* Device reset might occur several times,
+                                * give it one more chance */
+                               if (--reset_retries > 0)
+                                       continue;
+               }
                retries--;
 
        } while (the_result && retries);
 
-       if (the_result && !longrc) {
+       if (the_result) {
                sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY failed\n");
-               sd_print_result(sdkp, the_result);
-               if (driver_byte(the_result) & DRIVER_SENSE)
-                       sd_print_sense_hdr(sdkp, &sshdr);
-               else
-                       sd_printk(KERN_NOTICE, sdkp, "Sense not available.\n");
+               read_capacity_error(sdkp, sdp, &sshdr, sense_valid, the_result);
+               return -EINVAL;
+       }
 
-               /* Set dirty bit for removable devices if not ready -
-                * sometimes drives will not report this properly. */
-               if (sdp->removable &&
-                   sense_valid && sshdr.sense_key == NOT_READY)
-                       sdp->changed = 1;
+       sector_size = get_unaligned_be32(&buffer[4]);
+       lba = get_unaligned_be32(&buffer[0]);
 
-               /* Either no media are present but the drive didn't tell us,
-                  or they are present but the read capacity command fails */
-               /* sdkp->media_present = 0; -- not always correct */
-               sdkp->capacity = 0; /* unknown mapped to zero - as usual */
+       if (sdp->no_read_capacity_16 && (lba == 0xffffffff)) {
+               /* Some buggy (usb cardreader) devices return an lba of
+                  0xffffffff when the want to report a size of 0 (with
+                  which they really mean no media is present) */
+               sdkp->capacity = 0;
+               sdkp->physical_block_size = sector_size;
+               return sector_size;
+       }
 
-               return;
-       } else if (the_result && longrc) {
-               /* READ CAPACITY(16) has been failed */
-               sd_printk(KERN_NOTICE, sdkp, "READ CAPACITY(16) failed\n");
-               sd_print_result(sdkp, the_result);
-               sd_printk(KERN_NOTICE, sdkp, "Use 0xffffffff as device size\n");
+       if ((sizeof(sdkp->capacity) == 4) && (lba == 0xffffffff)) {
+               sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use a "
+                       "kernel compiled with support for large block "
+                       "devices.\n");
+               sdkp->capacity = 0;
+               return -EOVERFLOW;
+       }
 
-               sdkp->capacity = 1 + (sector_t) 0xffffffff;             
-               goto got_data;
-       }       
-       
-       if (!longrc) {
-               sector_size = (buffer[4] << 24) |
-                       (buffer[5] << 16) | (buffer[6] << 8) | buffer[7];
-               if (buffer[0] == 0xff && buffer[1] == 0xff &&
-                   buffer[2] == 0xff && buffer[3] == 0xff) {
-                       if(sizeof(sdkp->capacity) > 4) {
-                               sd_printk(KERN_NOTICE, sdkp, "Very big device. "
-                                         "Trying to use READ CAPACITY(16).\n");
-                               longrc = 1;
-                               goto repeat;
-                       }
-                       sd_printk(KERN_ERR, sdkp, "Too big for this kernel. Use "
-                                 "a kernel compiled with support for large "
-                                 "block devices.\n");
-                       sdkp->capacity = 0;
+       sdkp->capacity = lba + 1;
+       sdkp->physical_block_size = sector_size;
+       return sector_size;
+}
+
+static int sd_try_rc16_first(struct scsi_device *sdp)
+{
+       if (sdp->host->max_cmd_len < 16)
+               return 0;
+       if (sdp->scsi_level > SCSI_SPC_2)
+               return 1;
+       if (scsi_device_protection(sdp))
+               return 1;
+       return 0;
+}
+
+/*
+ * read disk capacity
+ */
+static void
+sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer)
+{
+       int sector_size;
+       struct scsi_device *sdp = sdkp->device;
+       sector_t old_capacity = sdkp->capacity;
+
+       if (sd_try_rc16_first(sdp)) {
+               sector_size = read_capacity_16(sdkp, sdp, buffer);
+               if (sector_size == -EOVERFLOW)
                        goto got_data;
-               }
-               sdkp->capacity = 1 + (((sector_t)buffer[0] << 24) |
-                       (buffer[1] << 16) |
-                       (buffer[2] << 8) |
-                       buffer[3]);                     
+               if (sector_size == -ENODEV)
+                       return;
+               if (sector_size < 0)
+                       sector_size = read_capacity_10(sdkp, sdp, buffer);
+               if (sector_size < 0)
+                       return;
        } else {
-               sdkp->capacity = 1 + (((u64)buffer[0] << 56) |
-                       ((u64)buffer[1] << 48) |
-                       ((u64)buffer[2] << 40) |
-                       ((u64)buffer[3] << 32) |
-                       ((sector_t)buffer[4] << 24) |
-                       ((sector_t)buffer[5] << 16) |
-                       ((sector_t)buffer[6] << 8)  |
-                       (sector_t)buffer[7]);
-                       
-               sector_size = (buffer[8] << 24) |
-                       (buffer[9] << 16) | (buffer[10] << 8) | buffer[11];
-
-               sd_read_protection_type(sdkp, buffer);
-       }       
-
-       /* Some devices return the total number of sectors, not the
-        * highest sector number.  Make the necessary adjustment. */
-       if (sdp->fix_capacity) {
-               --sdkp->capacity;
+               sector_size = read_capacity_10(sdkp, sdp, buffer);
+               if (sector_size == -EOVERFLOW)
+                       goto got_data;
+               if (sector_size < 0)
+                       return;
+               if ((sizeof(sdkp->capacity) > 4) &&
+                   (sdkp->capacity > 0xffffffffULL)) {
+                       int old_sector_size = sector_size;
+                       sd_printk(KERN_NOTICE, sdkp, "Very big device. "
+                                       "Trying to use READ CAPACITY(16).\n");
+                       sector_size = read_capacity_16(sdkp, sdp, buffer);
+                       if (sector_size < 0) {
+                               sd_printk(KERN_NOTICE, sdkp,
+                                       "Using 0xffffffff as device size\n");
+                               sdkp->capacity = 1 + (sector_t) 0xffffffff;
+                               sector_size = old_sector_size;
+                               goto got_data;
+                       }
+               }
+       }
 
-       /* 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;
+       /* Some devices are known to return the total number of blocks,
+        * not the highest block number.  Some devices have versions
+        * which do this and others which do not.  Some devices we might
+        * suspect of doing this but we don't know for certain.
+        *
+        * If we know the reported capacity is wrong, decrement it.  If
+        * we can only guess, then assume the number of blocks is even
+        * (usually true but not always) and err on the side of lowering
+        * the capacity.
+        */
+       if (sdp->fix_capacity ||
+           (sdp->guess_capacity && (sdkp->capacity & 0x01))) {
+               sd_printk(KERN_INFO, sdkp, "Adjusting the sector count "
+                               "from its reported value: %llu\n",
+                               (unsigned long long) sdkp->capacity);
+               --sdkp->capacity;
        }
 
 got_data:
@@ -1432,21 +1781,28 @@ got_data:
                 */
                sector_size = 512;
        }
-       blk_queue_hardsect_size(sdp->request_queue, sector_size);
+       blk_queue_logical_block_size(sdp->request_queue, sector_size);
 
        {
                char cap_str_2[10], cap_str_10[10];
-               u64 sz = sdkp->capacity << ffz(~sector_size);
+               u64 sz = (u64)sdkp->capacity << ilog2(sector_size);
 
                string_get_size(sz, STRING_UNITS_2, cap_str_2,
                                sizeof(cap_str_2));
                string_get_size(sz, STRING_UNITS_10, cap_str_10,
                                sizeof(cap_str_10));
 
-               sd_printk(KERN_NOTICE, sdkp,
-                         "%llu %d-byte hardware sectors: (%s/%s)\n",
-                         (unsigned long long)sdkp->capacity,
-                         sector_size, cap_str_10, cap_str_2);
+               if (sdkp->first_scan || old_capacity != sdkp->capacity) {
+                       sd_printk(KERN_NOTICE, sdkp,
+                                 "%llu %d-byte logical blocks: (%s/%s)\n",
+                                 (unsigned long long)sdkp->capacity,
+                                 sector_size, cap_str_10, cap_str_2);
+
+                       if (sdkp->physical_block_size != sector_size)
+                               sd_printk(KERN_NOTICE, sdkp,
+                                         "%u-byte physical blocks\n",
+                                         sdkp->physical_block_size);
+               }
        }
 
        /* Rescale capacity to 512-byte units */
@@ -1459,6 +1815,8 @@ got_data:
        else if (sector_size == 256)
                sdkp->capacity >>= 1;
 
+       blk_queue_physical_block_size(sdp->request_queue,
+                                     sdkp->physical_block_size);
        sdkp->device->sector_size = sector_size;
 }
 
@@ -1483,6 +1841,7 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
        int res;
        struct scsi_device *sdp = sdkp->device;
        struct scsi_mode_data data;
+       int old_wp = sdkp->write_prot;
 
        set_disk_ro(sdkp->disk, 0);
        if (sdp->skip_ms_page_3f) {
@@ -1523,11 +1882,13 @@ sd_read_write_protect_flag(struct scsi_disk *sdkp, unsigned char *buffer)
        } else {
                sdkp->write_prot = ((data.device_specific & 0x80) != 0);
                set_disk_ro(sdkp->disk, sdkp->write_prot);
-               sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
-                         sdkp->write_prot ? "on" : "off");
-               sd_printk(KERN_DEBUG, sdkp,
-                         "Mode Sense: %02x %02x %02x %02x\n",
-                         buffer[0], buffer[1], buffer[2], buffer[3]);
+               if (sdkp->first_scan || old_wp != sdkp->write_prot) {
+                       sd_printk(KERN_NOTICE, sdkp, "Write Protect is %s\n",
+                                 sdkp->write_prot ? "on" : "off");
+                       sd_printk(KERN_DEBUG, sdkp,
+                                 "Mode Sense: %02x %02x %02x %02x\n",
+                                 buffer[0], buffer[1], buffer[2], buffer[3]);
+               }
        }
 }
 
@@ -1545,11 +1906,18 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
        int modepage;
        struct scsi_mode_data data;
        struct scsi_sense_hdr sshdr;
+       int old_wce = sdkp->WCE;
+       int old_rcd = sdkp->RCD;
+       int old_dpofua = sdkp->DPOFUA;
 
-       if (sdp->skip_ms_page_8)
-               goto defaults;
-
-       if (sdp->type == TYPE_RBC) {
+       if (sdp->skip_ms_page_8) {
+               if (sdp->type == TYPE_RBC)
+                       goto defaults;
+               else {
+                       modepage = 0x3F;
+                       dbd = 0;
+               }
+       } else if (sdp->type == TYPE_RBC) {
                modepage = 6;
                dbd = 8;
        } else {
@@ -1577,13 +1945,11 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
         */
        if (len < 3)
                goto bad_sense;
-       if (len > 20)
-               len = 20;
-
-       /* Take headers and block descriptors into account */
-       len += data.header_length + data.block_descriptor_length;
-       if (len > SD_BUF_SIZE)
-               goto bad_sense;
+       else if (len > SD_BUF_SIZE) {
+               sd_printk(KERN_NOTICE, sdkp, "Truncating mode parameter "
+                         "data from %d to %d bytes\n", len, SD_BUF_SIZE);
+               len = SD_BUF_SIZE;
+       }
 
        /* Get the data */
        res = sd_do_mode_sense(sdp, dbd, modepage, buffer, len, &data, &sshdr);
@@ -1591,16 +1957,45 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
        if (scsi_status_is_good(res)) {
                int offset = data.header_length + data.block_descriptor_length;
 
-               if (offset >= SD_BUF_SIZE - 2) {
-                       sd_printk(KERN_ERR, sdkp, "Malformed MODE SENSE response\n");
-                       goto defaults;
+               while (offset < len) {
+                       u8 page_code = buffer[offset] & 0x3F;
+                       u8 spf       = buffer[offset] & 0x40;
+
+                       if (page_code == 8 || page_code == 6) {
+                               /* We're interested only in the first 3 bytes.
+                                */
+                               if (len - offset <= 2) {
+                                       sd_printk(KERN_ERR, sdkp, "Incomplete "
+                                                 "mode parameter data\n");
+                                       goto defaults;
+                               } else {
+                                       modepage = page_code;
+                                       goto Page_found;
+                               }
+                       } else {
+                               /* Go to the next page */
+                               if (spf && len - offset > 3)
+                                       offset += 4 + (buffer[offset+2] << 8) +
+                                               buffer[offset+3];
+                               else if (!spf && len - offset > 1)
+                                       offset += 2 + buffer[offset+1];
+                               else {
+                                       sd_printk(KERN_ERR, sdkp, "Incomplete "
+                                                 "mode parameter data\n");
+                                       goto defaults;
+                               }
+                       }
                }
 
-               if ((buffer[offset] & 0x3f) != modepage) {
+               if (modepage == 0x3F) {
+                       sd_printk(KERN_ERR, sdkp, "No Caching mode page "
+                                 "present\n");
+                       goto defaults;
+               } else if ((buffer[offset] & 0x3f) != modepage) {
                        sd_printk(KERN_ERR, sdkp, "Got wrong page\n");
                        goto defaults;
                }
-
+       Page_found:
                if (modepage == 8) {
                        sdkp->WCE = ((buffer[offset + 2] & 0x04) != 0);
                        sdkp->RCD = ((buffer[offset + 2] & 0x01) != 0);
@@ -1616,12 +2011,14 @@ sd_read_cache_type(struct scsi_disk *sdkp, unsigned char *buffer)
                        sdkp->DPOFUA = 0;
                }
 
-               sd_printk(KERN_NOTICE, sdkp,
-                      "Write cache: %s, read cache: %s, %s\n",
-                      sdkp->WCE ? "enabled" : "disabled",
-                      sdkp->RCD ? "disabled" : "enabled",
-                      sdkp->DPOFUA ? "supports DPO and FUA"
-                      : "doesn't support DPO or FUA");
+               if (sdkp->first_scan || old_wce != sdkp->WCE ||
+                   old_rcd != sdkp->RCD || old_dpofua != sdkp->DPOFUA)
+                       sd_printk(KERN_NOTICE, sdkp,
+                                 "Write cache: %s, read cache: %s, %s\n",
+                                 sdkp->WCE ? "enabled" : "disabled",
+                                 sdkp->RCD ? "disabled" : "enabled",
+                                 sdkp->DPOFUA ? "supports DPO and FUA"
+                                 : "doesn't support DPO or FUA");
 
                return;
        }
@@ -1646,7 +2043,7 @@ defaults:
  * The ATO bit indicates whether the DIF application tag is available
  * for use by the operating system.
  */
-void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
+static void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
 {
        int res, offset;
        struct scsi_device *sdp = sdkp->device;
@@ -1689,6 +2086,129 @@ void sd_read_app_tag_own(struct scsi_disk *sdkp, unsigned char *buffer)
 }
 
 /**
+ * sd_read_block_limits - Query disk device for preferred I/O sizes.
+ * @disk: disk to query
+ */
+static void sd_read_block_limits(struct scsi_disk *sdkp)
+{
+       struct request_queue *q = sdkp->disk->queue;
+       unsigned int sector_sz = sdkp->device->sector_size;
+       const int vpd_len = 64;
+       unsigned char *buffer = kmalloc(vpd_len, GFP_KERNEL);
+
+       if (!buffer ||
+           /* Block Limits VPD */
+           scsi_get_vpd_page(sdkp->device, 0xb0, buffer, vpd_len))
+               goto out;
+
+       blk_queue_io_min(sdkp->disk->queue,
+                        get_unaligned_be16(&buffer[6]) * sector_sz);
+       blk_queue_io_opt(sdkp->disk->queue,
+                        get_unaligned_be32(&buffer[12]) * sector_sz);
+
+       /* Thin provisioning enabled and page length indicates TP support */
+       if (sdkp->thin_provisioning && buffer[3] == 0x3c) {
+               unsigned int lba_count, desc_count, granularity;
+
+               lba_count = get_unaligned_be32(&buffer[20]);
+               desc_count = get_unaligned_be32(&buffer[24]);
+
+               if (lba_count && desc_count) {
+                       if (sdkp->tpvpd && !sdkp->tpu)
+                               sdkp->unmap = 0;
+                       else
+                               sdkp->unmap = 1;
+               }
+
+               if (sdkp->tpvpd && !sdkp->tpu && !sdkp->tpws) {
+                       sd_printk(KERN_ERR, sdkp, "Thin provisioning is " \
+                                 "enabled but neither TPU, nor TPWS are " \
+                                 "set. Disabling discard!\n");
+                       goto out;
+               }
+
+               if (lba_count)
+                       q->limits.max_discard_sectors =
+                               lba_count * sector_sz >> 9;
+
+               granularity = get_unaligned_be32(&buffer[28]);
+
+               if (granularity)
+                       q->limits.discard_granularity = granularity * sector_sz;
+
+               if (buffer[32] & 0x80)
+                       q->limits.discard_alignment =
+                               get_unaligned_be32(&buffer[32]) & ~(1 << 31);
+       }
+
+ out:
+       kfree(buffer);
+}
+
+/**
+ * sd_read_block_characteristics - Query block dev. characteristics
+ * @disk: disk to query
+ */
+static void sd_read_block_characteristics(struct scsi_disk *sdkp)
+{
+       unsigned char *buffer;
+       u16 rot;
+       const int vpd_len = 64;
+
+       buffer = kmalloc(vpd_len, GFP_KERNEL);
+
+       if (!buffer ||
+           /* Block Device Characteristics VPD */
+           scsi_get_vpd_page(sdkp->device, 0xb1, buffer, vpd_len))
+               goto out;
+
+       rot = get_unaligned_be16(&buffer[4]);
+
+       if (rot == 1)
+               queue_flag_set_unlocked(QUEUE_FLAG_NONROT, sdkp->disk->queue);
+
+ out:
+       kfree(buffer);
+}
+
+/**
+ * sd_read_thin_provisioning - Query thin provisioning VPD page
+ * @disk: disk to query
+ */
+static void sd_read_thin_provisioning(struct scsi_disk *sdkp)
+{
+       unsigned char *buffer;
+       const int vpd_len = 8;
+
+       if (sdkp->thin_provisioning == 0)
+               return;
+
+       buffer = kmalloc(vpd_len, GFP_KERNEL);
+
+       if (!buffer || scsi_get_vpd_page(sdkp->device, 0xb2, buffer, vpd_len))
+               goto out;
+
+       sdkp->tpvpd = 1;
+       sdkp->tpu   = (buffer[5] >> 7) & 1;     /* UNMAP */
+       sdkp->tpws  = (buffer[5] >> 6) & 1;     /* WRITE SAME(16) with UNMAP */
+
+ out:
+       kfree(buffer);
+}
+
+static int sd_try_extended_inquiry(struct scsi_device *sdp)
+{
+       /*
+        * 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)
+               return 1;
+       return 0;
+}
+
+/**
  *     sd_revalidate_disk - called the first time a new disk is seen,
  *     performs disk spin up, read_capacity, etc.
  *     @disk: struct gendisk we care about
@@ -1698,7 +2218,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
        struct scsi_disk *sdkp = scsi_disk(disk);
        struct scsi_device *sdp = sdkp->device;
        unsigned char *buffer;
-       unsigned ordered;
+       unsigned flush = 0;
 
        SCSI_LOG_HLQUEUE(3, sd_printk(KERN_INFO, sdkp,
                                      "sd_revalidate_disk\n"));
@@ -1717,15 +2237,6 @@ static int sd_revalidate_disk(struct gendisk *disk)
                goto out;
        }
 
-       /* defaults, until the device tells us otherwise */
-       sdp->sector_size = 512;
-       sdkp->capacity = 0;
-       sdkp->media_present = 1;
-       sdkp->write_prot = 0;
-       sdkp->WCE = 0;
-       sdkp->RCD = 0;
-       sdkp->ATO = 0;
-
        sd_spinup_disk(sdkp);
 
        /*
@@ -1734,24 +2245,31 @@ static int sd_revalidate_disk(struct gendisk *disk)
         */
        if (sdkp->media_present) {
                sd_read_capacity(sdkp, buffer);
+
+               if (sd_try_extended_inquiry(sdp)) {
+                       sd_read_thin_provisioning(sdkp);
+                       sd_read_block_limits(sdkp);
+                       sd_read_block_characteristics(sdkp);
+               }
+
                sd_read_write_protect_flag(sdkp, buffer);
                sd_read_cache_type(sdkp, buffer);
                sd_read_app_tag_own(sdkp, buffer);
        }
 
+       sdkp->first_scan = 0;
+
        /*
         * We now have all cache related info, determine how we deal
-        * with ordered requests.  Note that as the current SCSI
-        * dispatch function can alter request order, we cannot use
-        * QUEUE_ORDERED_TAG_* even when ordered tag is supported.
+        * with flush requests.
         */
-       if (sdkp->WCE)
-               ordered = sdkp->DPOFUA
-                       ? QUEUE_ORDERED_DRAIN_FUA : QUEUE_ORDERED_DRAIN_FLUSH;
-       else
-               ordered = QUEUE_ORDERED_DRAIN;
+       if (sdkp->WCE) {
+               flush |= REQ_FLUSH;
+               if (sdkp->DPOFUA)
+                       flush |= REQ_FUA;
+       }
 
-       blk_queue_ordered(sdkp->disk->queue, ordered, sd_prepare_flush);
+       blk_queue_flush(sdkp->disk->queue, flush);
 
        set_capacity(disk, sdkp->capacity);
        kfree(buffer);
@@ -1761,6 +2279,26 @@ static int sd_revalidate_disk(struct gendisk *disk)
 }
 
 /**
+ *     sd_unlock_native_capacity - unlock native capacity
+ *     @disk: struct gendisk to set capacity for
+ *
+ *     Block layer calls this function if it detects that partitions
+ *     on @disk reach beyond the end of the device.  If the SCSI host
+ *     implements ->unlock_native_capacity() method, it's invoked to
+ *     give it a chance to adjust the device capacity.
+ *
+ *     CONTEXT:
+ *     Defined by block layer.  Might sleep.
+ */
+static void sd_unlock_native_capacity(struct gendisk *disk)
+{
+       struct scsi_device *sdev = scsi_disk(disk)->device;
+
+       if (sdev->host->hostt->unlock_native_capacity)
+               sdev->host->hostt->unlock_native_capacity(sdev);
+}
+
+/**
  *     sd_format_disk_name - format disk name
  *     @prefix: name prefix - ie. "sd" for SCSI disks
  *     @index: index of the disk to format name for
@@ -1772,7 +2310,7 @@ static int sd_revalidate_disk(struct gendisk *disk)
  *     which is followed by sdaaa.
  *
  *     This is basically 26 base counting with one extra 'nil' entry
- *     at the beggining from the second digit on and can be
+ *     at the beginning from the second digit on and can be
  *     determined using similar method as 26 base conversion with the
  *     index shifted -1 after each digit is computed.
  *
@@ -1806,6 +2344,63 @@ static int sd_format_disk_name(char *prefix, int index, char *buf, int buflen)
        return 0;
 }
 
+/*
+ * The asynchronous part of sd_probe
+ */
+static void sd_probe_async(void *data, async_cookie_t cookie)
+{
+       struct scsi_disk *sdkp = data;
+       struct scsi_device *sdp;
+       struct gendisk *gd;
+       u32 index;
+       struct device *dev;
+
+       sdp = sdkp->device;
+       gd = sdkp->disk;
+       index = sdkp->index;
+       dev = &sdp->sdev_gendev;
+
+       gd->major = sd_major((index & 0xf0) >> 4);
+       gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
+       gd->minors = SD_MINORS;
+
+       gd->fops = &sd_fops;
+       gd->private_data = &sdkp->driver;
+       gd->queue = sdkp->device->request_queue;
+
+       /* defaults, until the device tells us otherwise */
+       sdp->sector_size = 512;
+       sdkp->capacity = 0;
+       sdkp->media_present = 1;
+       sdkp->write_prot = 0;
+       sdkp->WCE = 0;
+       sdkp->RCD = 0;
+       sdkp->ATO = 0;
+       sdkp->first_scan = 1;
+
+       sd_revalidate_disk(gd);
+
+       blk_queue_prep_rq(sdp->request_queue, sd_prep_fn);
+       blk_queue_unprep_rq(sdp->request_queue, sd_unprep_fn);
+
+       gd->driverfs_dev = &sdp->sdev_gendev;
+       gd->flags = GENHD_FL_EXT_DEVT;
+       if (sdp->removable) {
+               gd->flags |= GENHD_FL_REMOVABLE;
+               gd->events |= DISK_EVENT_MEDIA_CHANGE;
+       }
+
+       add_disk(gd);
+       sd_dif_config_host(sdkp);
+
+       sd_revalidate_disk(gd);
+
+       sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
+                 sdp->removable ? "removable " : "");
+       scsi_autopm_put_device(sdp);
+       put_device(&sdkp->dev);
+}
+
 /**
  *     sd_probe - called during driver initialization and whenever a
  *     new scsi device is attached to the system. It is called once
@@ -1829,7 +2424,7 @@ static int sd_probe(struct device *dev)
        struct scsi_device *sdp = to_scsi_device(dev);
        struct scsi_disk *sdkp;
        struct gendisk *gd;
-       u32 index;
+       int index;
        int error;
 
        error = -ENODEV;
@@ -1852,12 +2447,20 @@ static int sd_probe(struct device *dev)
                if (!ida_pre_get(&sd_index_ida, GFP_KERNEL))
                        goto out_put;
 
+               spin_lock(&sd_index_lock);
                error = ida_get_new(&sd_index_ida, &index);
+               spin_unlock(&sd_index_lock);
        } while (error == -EAGAIN);
 
        if (error)
                goto out_put;
 
+       if (index >= SD_MAX_DISKS) {
+               error = -ENODEV;
+               sdev_printk(KERN_WARNING, sdp, "SCSI disk (sd) name space exhausted.\n");
+               goto out_free_index;
+       }
+
        error = sd_format_disk_name("sd", index, gd->disk_name, DISK_NAME_LEN);
        if (error)
                goto out_free_index;
@@ -1866,8 +2469,7 @@ static int sd_probe(struct device *dev)
        sdkp->driver = &sd_template;
        sdkp->disk = gd;
        sdkp->index = index;
-       sdkp->openers = 0;
-       sdkp->previous_state = 1;
+       atomic_set(&sdkp->openers, 0);
 
        if (!sdp->request_queue->rq_timeout) {
                if (sdp->type != TYPE_MOD)
@@ -1878,44 +2480,25 @@ static int sd_probe(struct device *dev)
        }
 
        device_initialize(&sdkp->dev);
-       sdkp->dev.parent = &sdp->sdev_gendev;
+       sdkp->dev.parent = dev;
        sdkp->dev.class = &sd_disk_class;
-       strncpy(sdkp->dev.bus_id, sdp->sdev_gendev.bus_id, BUS_ID_SIZE);
+       dev_set_name(&sdkp->dev, dev_name(dev));
 
        if (device_add(&sdkp->dev))
                goto out_free_index;
 
-       get_device(&sdp->sdev_gendev);
-
-       if (index < SD_MAX_DISKS) {
-               gd->major = sd_major((index & 0xf0) >> 4);
-               gd->first_minor = ((index & 0xf) << 4) | (index & 0xfff00);
-               gd->minors = SD_MINORS;
-       }
-       gd->fops = &sd_fops;
-       gd->private_data = &sdkp->driver;
-       gd->queue = sdkp->device->request_queue;
-
-       sd_revalidate_disk(gd);
-
-       blk_queue_prep_rq(sdp->request_queue, sd_prep_fn);
-
-       gd->driverfs_dev = &sdp->sdev_gendev;
-       gd->flags = GENHD_FL_EXT_DEVT | GENHD_FL_DRIVERFS;
-       if (sdp->removable)
-               gd->flags |= GENHD_FL_REMOVABLE;
-
+       get_device(dev);
        dev_set_drvdata(dev, sdkp);
-       add_disk(gd);
-       sd_dif_config_host(sdkp);
 
-       sd_printk(KERN_NOTICE, sdkp, "Attached SCSI %sdisk\n",
-                 sdp->removable ? "removable " : "");
+       get_device(&sdkp->dev); /* prevent release before async_schedule */
+       async_schedule(sd_probe_async, sdkp);
 
        return 0;
 
  out_free_index:
+       spin_lock(&sd_index_lock);
        ida_remove(&sd_index_ida, index);
+       spin_unlock(&sd_index_lock);
  out_put:
        put_disk(gd);
  out_free:
@@ -1937,8 +2520,14 @@ static int sd_probe(struct device *dev)
  **/
 static int sd_remove(struct device *dev)
 {
-       struct scsi_disk *sdkp = dev_get_drvdata(dev);
+       struct scsi_disk *sdkp;
 
+       sdkp = dev_get_drvdata(dev);
+       scsi_autopm_get_device(sdkp->device);
+
+       async_synchronize_full();
+       blk_queue_prep_rq(sdkp->device->request_queue, scsi_prep_fn);
+       blk_queue_unprep_rq(sdkp->device->request_queue, NULL);
        device_del(&sdkp->dev);
        del_gendisk(sdkp->disk);
        sd_shutdown(dev);
@@ -1965,7 +2554,9 @@ static void scsi_disk_release(struct device *dev)
        struct scsi_disk *sdkp = to_scsi_disk(dev);
        struct gendisk *disk = sdkp->disk;
        
+       spin_lock(&sd_index_lock);
        ida_remove(&sd_index_ida, sdkp->index);
+       spin_unlock(&sd_index_lock);
 
        disk->private_data = NULL;
        put_disk(disk);
@@ -1991,7 +2582,7 @@ static int sd_start_stop_device(struct scsi_disk *sdkp, int start)
                return -ENODEV;
 
        res = scsi_execute_req(sdp, cmd, DMA_NONE, NULL, 0, &sshdr,
-                              SD_TIMEOUT, SD_MAX_RETRIES);
+                              SD_TIMEOUT, SD_MAX_RETRIES, NULL);
        if (res) {
                sd_printk(KERN_WARNING, sdkp, "START_STOP FAILED\n");
                sd_print_result(sdkp, res);
@@ -2095,8 +2686,24 @@ static int __init init_sd(void)
        if (err)
                goto err_out_class;
 
+       sd_cdb_cache = kmem_cache_create("sd_ext_cdb", SD_EXT_CDB_SIZE,
+                                        0, 0, NULL);
+       if (!sd_cdb_cache) {
+               printk(KERN_ERR "sd: can't init extended cdb cache\n");
+               goto err_out_class;
+       }
+
+       sd_cdb_pool = mempool_create_slab_pool(SD_MEMPOOL_SIZE, sd_cdb_cache);
+       if (!sd_cdb_pool) {
+               printk(KERN_ERR "sd: can't init extended cdb pool\n");
+               goto err_out_cache;
+       }
+
        return 0;
 
+err_out_cache:
+       kmem_cache_destroy(sd_cdb_cache);
+
 err_out_class:
        class_unregister(&sd_disk_class);
 err_out:
@@ -2116,6 +2723,9 @@ static void __exit exit_sd(void)
 
        SCSI_LOG_HLQUEUE(3, printk("exit_sd: exiting sd driver\n"));
 
+       mempool_destroy(sd_cdb_pool);
+       kmem_cache_destroy(sd_cdb_cache);
+
        scsi_unregister_driver(&sd_template.gendrv);
        class_unregister(&sd_disk_class);
 
@@ -2129,15 +2739,15 @@ module_exit(exit_sd);
 static void sd_print_sense_hdr(struct scsi_disk *sdkp,
                               struct scsi_sense_hdr *sshdr)
 {
-       sd_printk(KERN_INFO, sdkp, "");
+       sd_printk(KERN_INFO, sdkp, " ");
        scsi_show_sense_hdr(sshdr);
-       sd_printk(KERN_INFO, sdkp, "");
+       sd_printk(KERN_INFO, sdkp, " ");
        scsi_show_extd_sense(sshdr->asc, sshdr->ascq);
 }
 
 static void sd_print_result(struct scsi_disk *sdkp, int result)
 {
-       sd_printk(KERN_INFO, sdkp, "");
+       sd_printk(KERN_INFO, sdkp, " ");
        scsi_show_result(result);
 }