target: replace se_cmd->execute_rw with a protocol_data field

[deliverable/linux.git] / drivers / target / target_core_iblock.c

diff --git a/drivers/target/target_core_iblock.c b/drivers/target/target_core_iblock.c
index d4a4b0fb444a12907fac835f6a3db03600b722fa..ae8ad2da6632f426b7dc39da0b72e659aec16285 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -41,7 +41,6 @@
 
 #include <target/target_core_base.h>
 #include <target/target_core_backend.h>
-#include <target/target_core_backend_configfs.h>
 
 #include "target_core_iblock.h"
 
@@ -54,12 +53,6 @@ static inline struct iblock_dev *IBLOCK_DEV(struct se_device *dev)
 }
 
 
-static struct se_subsystem_api iblock_template;
-
-/*     iblock_attach_hba(): (Part of se_subsystem_api_t template)
- *
- *
- */
 static int iblock_attach_hba(struct se_hba *hba, u32 host_id)
 {
        pr_debug("CORE_HBA[%d] - TCM iBlock HBA Driver %s on"
@@ -198,6 +191,14 @@ out:
        return ret;
 }
 
+static void iblock_dev_call_rcu(struct rcu_head *p)
+{
+       struct se_device *dev = container_of(p, struct se_device, rcu_head);
+       struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
+
+       kfree(ib_dev);
+}
+
 static void iblock_free_device(struct se_device *dev)
 {
        struct iblock_dev *ib_dev = IBLOCK_DEV(dev);
@@ -207,7 +208,7 @@ static void iblock_free_device(struct se_device *dev)
        if (ib_dev->ibd_bio_set != NULL)
                bioset_free(ib_dev->ibd_bio_set);
 
-       kfree(ib_dev);
+       call_rcu(&dev->rcu_head, iblock_dev_call_rcu);
 }
 
 static unsigned long long iblock_emulate_read_cap_with_block_size(
@@ -444,7 +445,7 @@ iblock_execute_write_same_unmap(struct se_cmd *cmd)
        struct block_device *bdev = IBLOCK_DEV(cmd->se_dev)->ibd_bd;
        sector_t lba = cmd->t_task_lba;
        sector_t nolb = sbc_get_write_same_sectors(cmd);
-       int ret;
+       sense_reason_t ret;
 
        ret = iblock_do_unmap(cmd, bdev, lba, nolb);
        if (ret)
@@ -774,7 +775,7 @@ iblock_execute_rw(struct se_cmd *cmd, struct scatterlist *sgl, u32 sgl_nents,
                sg_num--;
        }
 
-       if (cmd->prot_type) {
+       if (cmd->prot_type && dev->dev_attrib.pi_prot_type) {
                int rc = iblock_alloc_bip(cmd, bio_start);
                if (rc)
                        goto fail_put_bios;
@@ -864,47 +865,11 @@ static bool iblock_get_write_cache(struct se_device *dev)
        return q->flush_flags & REQ_FLUSH;
 }
 
-DEF_TB_DEFAULT_ATTRIBS(iblock);
-
-static struct configfs_attribute *iblock_backend_dev_attrs[] = {
-       &iblock_dev_attrib_emulate_model_alias.attr,
-       &iblock_dev_attrib_emulate_dpo.attr,
-       &iblock_dev_attrib_emulate_fua_write.attr,
-       &iblock_dev_attrib_emulate_fua_read.attr,
-       &iblock_dev_attrib_emulate_write_cache.attr,
-       &iblock_dev_attrib_emulate_ua_intlck_ctrl.attr,
-       &iblock_dev_attrib_emulate_tas.attr,
-       &iblock_dev_attrib_emulate_tpu.attr,
-       &iblock_dev_attrib_emulate_tpws.attr,
-       &iblock_dev_attrib_emulate_caw.attr,
-       &iblock_dev_attrib_emulate_3pc.attr,
-       &iblock_dev_attrib_pi_prot_type.attr,
-       &iblock_dev_attrib_hw_pi_prot_type.attr,
-       &iblock_dev_attrib_pi_prot_format.attr,
-       &iblock_dev_attrib_enforce_pr_isids.attr,
-       &iblock_dev_attrib_is_nonrot.attr,
-       &iblock_dev_attrib_emulate_rest_reord.attr,
-       &iblock_dev_attrib_force_pr_aptpl.attr,
-       &iblock_dev_attrib_hw_block_size.attr,
-       &iblock_dev_attrib_block_size.attr,
-       &iblock_dev_attrib_hw_max_sectors.attr,
-       &iblock_dev_attrib_optimal_sectors.attr,
-       &iblock_dev_attrib_hw_queue_depth.attr,
-       &iblock_dev_attrib_queue_depth.attr,
-       &iblock_dev_attrib_max_unmap_lba_count.attr,
-       &iblock_dev_attrib_max_unmap_block_desc_count.attr,
-       &iblock_dev_attrib_unmap_granularity.attr,
-       &iblock_dev_attrib_unmap_granularity_alignment.attr,
-       &iblock_dev_attrib_max_write_same_len.attr,
-       NULL,
-};
-
-static struct se_subsystem_api iblock_template = {
+static const struct target_backend_ops iblock_ops = {
        .name                   = "iblock",
        .inquiry_prod           = "IBLOCK",
        .inquiry_rev            = IBLOCK_VERSION,
        .owner                  = THIS_MODULE,
-       .transport_type         = TRANSPORT_PLUGIN_VHBA_PDEV,
        .attach_hba             = iblock_attach_hba,
        .detach_hba             = iblock_detach_hba,
        .alloc_device           = iblock_alloc_device,
@@ -920,21 +885,17 @@ static struct se_subsystem_api iblock_template = {
        .get_io_min             = iblock_get_io_min,
        .get_io_opt             = iblock_get_io_opt,
        .get_write_cache        = iblock_get_write_cache,
+       .tb_dev_attrib_attrs    = sbc_attrib_attrs,
 };
 
 static int __init iblock_module_init(void)
 {
-       struct target_backend_cits *tbc = &iblock_template.tb_cits;
-
-       target_core_setup_sub_cits(&iblock_template);
-       tbc->tb_dev_attrib_cit.ct_attrs = iblock_backend_dev_attrs;
-
-       return transport_subsystem_register(&iblock_template);
+       return transport_backend_register(&iblock_ops);
 }
 
 static void __exit iblock_module_exit(void)
 {
-       transport_subsystem_release(&iblock_template);
+       target_backend_unregister(&iblock_ops);
 }
 
 MODULE_DESCRIPTION("TCM IBLOCK subsystem plugin");