Merge tag 'scsi-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb...

[karo-tx-linux.git] / drivers / scsi / sd.c

diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c
index 96af195224f2b9dae866ea109afb1d894c142c80..e9689d57ccb6cb558925b63091ff3a95accdef28 100644 (file)
--- a/drivers/scsi/sd.c
+++ b/drivers/scsi/sd.c
@@ -109,6 +109,8 @@ static int sd_suspend_system(struct device *);
 static int sd_suspend_runtime(struct device *);
 static int sd_resume(struct device *);
 static void sd_rescan(struct device *);
+static int sd_init_command(struct scsi_cmnd *SCpnt);
+static void sd_uninit_command(struct scsi_cmnd *SCpnt);
 static int sd_done(struct scsi_cmnd *);
 static int sd_eh_action(struct scsi_cmnd *, int);
 static void sd_read_capacity(struct scsi_disk *sdkp, unsigned char *buffer);
@@ -503,6 +505,8 @@ static struct scsi_driver sd_template = {
                .pm             = &sd_pm_ops,
        },
        .rescan                 = sd_rescan,
+       .init_command           = sd_init_command,
+       .uninit_command         = sd_uninit_command,
        .done                   = sd_done,
        .eh_action              = sd_eh_action,
 };
@@ -836,9 +840,9 @@ static int scsi_setup_flush_cmnd(struct scsi_device *sdp, struct request *rq)
        return scsi_setup_blk_pc_cmnd(sdp, rq);
 }
 
-static void sd_unprep_fn(struct request_queue *q, struct request *rq)
+static void sd_uninit_command(struct scsi_cmnd *SCpnt)
 {
-       struct scsi_cmnd *SCpnt = rq->special;
+       struct request *rq = SCpnt->request;
 
        if (rq->cmd_flags & REQ_DISCARD)
                __free_page(rq->completion_data);
@@ -850,18 +854,10 @@ static void sd_unprep_fn(struct request_queue *q, struct request *rq)
        }
 }
 
-/**
- *     sd_prep_fn - build a scsi (read or write) command from
- *     information in the request structure.
- *     @SCpnt: pointer to mid-level's per scsi command structure that
- *     contains request and into which the scsi command is written
- *
- *     Returns 1 if successful and 0 if error (or cannot be done now).
- **/
-static int sd_prep_fn(struct request_queue *q, struct request *rq)
+static int sd_init_command(struct scsi_cmnd *SCpnt)
 {
-       struct scsi_cmnd *SCpnt;
-       struct scsi_device *sdp = q->queuedata;
+       struct request *rq = SCpnt->request;
+       struct scsi_device *sdp = SCpnt->device;
        struct gendisk *disk = rq->rq_disk;
        struct scsi_disk *sdkp;
        sector_t block = blk_rq_pos(rq);
@@ -883,12 +879,6 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
        } 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) {
-               ret = BLKPREP_KILL;
-               goto out;
        }
        ret = scsi_setup_fs_cmnd(sdp, rq);
        if (ret != BLKPREP_OK)
@@ -900,11 +890,10 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         * is used for a killable error condition */
        ret = BLKPREP_KILL;
 
-       SCSI_LOG_HLQUEUE(1, scmd_printk(KERN_INFO, SCpnt,
-                                       "sd_prep_fn: block=%llu, "
-                                       "count=%d\n",
-                                       (unsigned long long)block,
-                                       this_count));
+       SCSI_LOG_HLQUEUE(1,
+               scmd_printk(KERN_INFO, SCpnt,
+                       "%s: block=%llu, count=%d\n",
+                       __func__, (unsigned long long)block, this_count));
 
        if (!sdp || !scsi_device_online(sdp) ||
            block + blk_rq_sectors(rq) > get_capacity(disk)) {
@@ -1124,7 +1113,7 @@ static int sd_prep_fn(struct request_queue *q, struct request *rq)
         */
        ret = BLKPREP_OK;
  out:
-       return scsi_prep_return(q, rq, ret);
+       return ret;
 }
 
 /**
@@ -1686,12 +1675,12 @@ static int sd_done(struct scsi_cmnd *SCpnt)
                                                   sshdr.ascq));
        }
 #endif
+       sdkp->medium_access_timed_out = 0;
+
        if (driver_byte(result) != DRIVER_SENSE &&
            (!sense_valid || sense_deferred))
                goto out;
 
-       sdkp->medium_access_timed_out = 0;
-
        switch (sshdr.sense_key) {
        case HARDWARE_ERROR:
        case MEDIUM_ERROR:
@@ -2875,9 +2864,6 @@ static void sd_probe_async(void *data, async_cookie_t cookie)
 
        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) {
@@ -3025,8 +3011,6 @@ static int sd_remove(struct device *dev)
 
        async_synchronize_full_domain(&scsi_sd_pm_domain);
        async_synchronize_full_domain(&scsi_sd_probe_domain);
-       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);