Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target...

[karo-tx-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 972ed1781ae2f0ad08c5671d7f8cc535cf12cde9..6d88d24e6cce97ab3cca4078d3fb41a2ae0c0220 100644 (file)
--- a/drivers/target/target_core_iblock.c
+++ b/drivers/target/target_core_iblock.c
@@ -40,7 +40,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"
 
@@ -53,17 +52,11 @@ 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"
                " Generic Target Core Stack %s\n", hba->hba_id,
-               IBLOCK_VERSION, TARGET_CORE_MOD_VERSION);
+               IBLOCK_VERSION, TARGET_CORE_VERSION);
        return 0;
 }
 
@@ -197,6 +190,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);
@@ -206,7 +207,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(
@@ -414,10 +415,9 @@ iblock_execute_sync_cache(struct se_cmd *cmd)
 }
 
 static sense_reason_t
-iblock_do_unmap(struct se_cmd *cmd, void *priv,
-               sector_t lba, sector_t nolb)
+iblock_execute_unmap(struct se_cmd *cmd, sector_t lba, sector_t nolb)
 {
-       struct block_device *bdev = priv;
+       struct block_device *bdev = IBLOCK_DEV(cmd->se_dev)->ibd_bd;
        int ret;
 
        ret = blkdev_issue_discard(bdev, lba, nolb, GFP_KERNEL, 0);
@@ -429,30 +429,6 @@ iblock_do_unmap(struct se_cmd *cmd, void *priv,
        return 0;
 }
 
-static sense_reason_t
-iblock_execute_unmap(struct se_cmd *cmd)
-{
-       struct block_device *bdev = IBLOCK_DEV(cmd->se_dev)->ibd_bd;
-
-       return sbc_execute_unmap(cmd, iblock_do_unmap, bdev);
-}
-
-static sense_reason_t
-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);
-       sense_reason_t ret;
-
-       ret = iblock_do_unmap(cmd, bdev, lba, nolb);
-       if (ret)
-               return ret;
-
-       target_complete_cmd(cmd, GOOD);
-       return 0;
-}
-
 static sense_reason_t
 iblock_execute_write_same(struct se_cmd *cmd)
 {
@@ -844,7 +820,6 @@ static struct sbc_ops iblock_sbc_ops = {
        .execute_rw             = iblock_execute_rw,
        .execute_sync_cache     = iblock_execute_sync_cache,
        .execute_write_same     = iblock_execute_write_same,
-       .execute_write_same_unmap = iblock_execute_write_same_unmap,
        .execute_unmap          = iblock_execute_unmap,
 };
 
@@ -863,42 +838,7 @@ 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,
@@ -918,21 +858,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");