scsi: allocate scsi_cmnd structures as part of struct request

[tomoyo/tomoyo-test1.git] / drivers / scsi / hosts.c

diff --git a/drivers/scsi/hosts.c b/drivers/scsi/hosts.c
index 6d29c4a..831a1c8 100644 (file)
--- a/drivers/scsi/hosts.c
+++ b/drivers/scsi/hosts.c
@@ -230,19 +230,6 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
                }
        }
 
-       /*
-        * Note that we allocate the freelist even for the MQ case for now,
-        * as we need a command set aside for scsi_reset_provider.  Having
-        * the full host freelist and one command available for that is a
-        * little heavy-handed, but avoids introducing a special allocator
-        * just for this.  Eventually the structure of scsi_reset_provider
-        * will need a major overhaul.
-        */
-       error = scsi_setup_command_freelist(shost);
-       if (error)
-               goto out_destroy_tags;
-
-
        if (!shost->shost_gendev.parent)
                shost->shost_gendev.parent = dev ? dev : &platform_bus;
        if (!dma_dev)
@@ -262,7 +249,7 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
 
        error = device_add(&shost->shost_gendev);
        if (error)
-               goto out_destroy_freelist;
+               goto out_disable_runtime_pm;
 
        scsi_host_set_state(shost, SHOST_RUNNING);
        get_device(shost->shost_gendev.parent);
@@ -312,13 +299,11 @@ int scsi_add_host_with_dma(struct Scsi_Host *shost, struct device *dev,
        device_del(&shost->shost_dev);
  out_del_gendev:
        device_del(&shost->shost_gendev);
- out_destroy_freelist:
+ out_disable_runtime_pm:
        device_disable_async_suspend(&shost->shost_gendev);
        pm_runtime_disable(&shost->shost_gendev);
        pm_runtime_set_suspended(&shost->shost_gendev);
        pm_runtime_put_noidle(&shost->shost_gendev);
-       scsi_destroy_command_freelist(shost);
- out_destroy_tags:
        if (shost_use_blk_mq(shost))
                scsi_mq_destroy_tags(shost);
  fail:
@@ -359,7 +344,6 @@ static void scsi_host_dev_release(struct device *dev)
                kfree(dev_name(&shost->shost_dev));
        }
 
-       scsi_destroy_command_freelist(shost);
        if (shost_use_blk_mq(shost)) {
                if (shost->tag_set.tags)
                        scsi_mq_destroy_tags(shost);