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

[linux.git] / drivers / target / tcm_fc / tfc_conf.c

diff --git a/drivers/target/tcm_fc/tfc_conf.c b/drivers/target/tcm_fc/tfc_conf.c
index e879da81ad9303c2ad1d0d4d0487662523bc1b1c..efdcb9663a1a699520d3543b544ebac5c34ad860 100644 (file)
--- a/drivers/target/tcm_fc/tfc_conf.c
+++ b/drivers/target/tcm_fc/tfc_conf.c
@@ -50,7 +50,7 @@
 
 struct target_fabric_configfs *ft_configfs;
 
-LIST_HEAD(ft_lport_list);
+static LIST_HEAD(ft_wwn_list);
 DEFINE_MUTEX(ft_lport_lock);
 
 unsigned int ft_debug_logging;
@@ -298,7 +298,7 @@ static struct se_portal_group *ft_add_tpg(
        struct config_group *group,
        const char *name)
 {
-       struct ft_lport_acl *lacl;
+       struct ft_lport_wwn *ft_wwn;
        struct ft_tpg *tpg;
        struct workqueue_struct *wq;
        unsigned long index;
@@ -318,12 +318,17 @@ static struct se_portal_group *ft_add_tpg(
        if (index > UINT_MAX)
                return NULL;
 
-       lacl = container_of(wwn, struct ft_lport_acl, fc_lport_wwn);
+       if ((index != 1)) {
+               pr_err("Error, a single TPG=1 is used for HW port mappings\n");
+               return ERR_PTR(-ENOSYS);
+       }
+
+       ft_wwn = container_of(wwn, struct ft_lport_wwn, se_wwn);
        tpg = kzalloc(sizeof(*tpg), GFP_KERNEL);
        if (!tpg)
                return NULL;
        tpg->index = index;
-       tpg->lport_acl = lacl;
+       tpg->lport_wwn = ft_wwn;
        INIT_LIST_HEAD(&tpg->lun_list);
 
        wq = alloc_workqueue("tcm_fc", 0, 1);
@@ -342,7 +347,7 @@ static struct se_portal_group *ft_add_tpg(
        tpg->workqueue = wq;
 
        mutex_lock(&ft_lport_lock);
-       list_add_tail(&tpg->list, &lacl->tpg_list);
+       ft_wwn->tpg = tpg;
        mutex_unlock(&ft_lport_lock);
 
        return &tpg->se_tpg;
@@ -351,6 +356,7 @@ static struct se_portal_group *ft_add_tpg(
 static void ft_del_tpg(struct se_portal_group *se_tpg)
 {
        struct ft_tpg *tpg = container_of(se_tpg, struct ft_tpg, se_tpg);
+       struct ft_lport_wwn *ft_wwn = tpg->lport_wwn;
 
        pr_debug("del tpg %s\n",
                    config_item_name(&tpg->se_tpg.tpg_group.cg_item));
@@ -361,7 +367,7 @@ static void ft_del_tpg(struct se_portal_group *se_tpg)
        synchronize_rcu();
 
        mutex_lock(&ft_lport_lock);
-       list_del(&tpg->list);
+       ft_wwn->tpg = NULL;
        if (tpg->tport) {
                tpg->tport->tpg = NULL;
                tpg->tport = NULL;
@@ -380,15 +386,11 @@ static void ft_del_tpg(struct se_portal_group *se_tpg)
  */
 struct ft_tpg *ft_lport_find_tpg(struct fc_lport *lport)
 {
-       struct ft_lport_acl *lacl;
-       struct ft_tpg *tpg;
+       struct ft_lport_wwn *ft_wwn;
 
-       list_for_each_entry(lacl, &ft_lport_list, list) {
-               if (lacl->wwpn == lport->wwpn) {
-                       list_for_each_entry(tpg, &lacl->tpg_list, list)
-                               return tpg; /* XXX for now return first entry */
-                       return NULL;
-               }
+       list_for_each_entry(ft_wwn, &ft_wwn_list, ft_wwn_node) {
+               if (ft_wwn->wwpn == lport->wwpn)
+                       return ft_wwn->tpg;
        }
        return NULL;
 }
@@ -401,50 +403,49 @@ struct ft_tpg *ft_lport_find_tpg(struct fc_lport *lport)
  * Add lport to allowed config.
  * The name is the WWPN in lower-case ASCII, colon-separated bytes.
  */
-static struct se_wwn *ft_add_lport(
+static struct se_wwn *ft_add_wwn(
        struct target_fabric_configfs *tf,
        struct config_group *group,
        const char *name)
 {
-       struct ft_lport_acl *lacl;
-       struct ft_lport_acl *old_lacl;
+       struct ft_lport_wwn *ft_wwn;
+       struct ft_lport_wwn *old_ft_wwn;
        u64 wwpn;
 
-       pr_debug("add lport %s\n", name);
+       pr_debug("add wwn %s\n", name);
        if (ft_parse_wwn(name, &wwpn, 1) < 0)
                return NULL;
-       lacl = kzalloc(sizeof(*lacl), GFP_KERNEL);
-       if (!lacl)
+       ft_wwn = kzalloc(sizeof(*ft_wwn), GFP_KERNEL);
+       if (!ft_wwn)
                return NULL;
-       lacl->wwpn = wwpn;
-       INIT_LIST_HEAD(&lacl->tpg_list);
+       ft_wwn->wwpn = wwpn;
 
        mutex_lock(&ft_lport_lock);
-       list_for_each_entry(old_lacl, &ft_lport_list, list) {
-               if (old_lacl->wwpn == wwpn) {
+       list_for_each_entry(old_ft_wwn, &ft_wwn_list, ft_wwn_node) {
+               if (old_ft_wwn->wwpn == wwpn) {
                        mutex_unlock(&ft_lport_lock);
-                       kfree(lacl);
+                       kfree(ft_wwn);
                        return NULL;
                }
        }
-       list_add_tail(&lacl->list, &ft_lport_list);
-       ft_format_wwn(lacl->name, sizeof(lacl->name), wwpn);
+       list_add_tail(&ft_wwn->ft_wwn_node, &ft_wwn_list);
+       ft_format_wwn(ft_wwn->name, sizeof(ft_wwn->name), wwpn);
        mutex_unlock(&ft_lport_lock);
 
-       return &lacl->fc_lport_wwn;
+       return &ft_wwn->se_wwn;
 }
 
-static void ft_del_lport(struct se_wwn *wwn)
+static void ft_del_wwn(struct se_wwn *wwn)
 {
-       struct ft_lport_acl *lacl = container_of(wwn,
-                               struct ft_lport_acl, fc_lport_wwn);
+       struct ft_lport_wwn *ft_wwn = container_of(wwn,
+                               struct ft_lport_wwn, se_wwn);
 
-       pr_debug("del lport %s\n", lacl->name);
+       pr_debug("del wwn %s\n", ft_wwn->name);
        mutex_lock(&ft_lport_lock);
-       list_del(&lacl->list);
+       list_del(&ft_wwn->ft_wwn_node);
        mutex_unlock(&ft_lport_lock);
 
-       kfree(lacl);
+       kfree(ft_wwn);
 }
 
 static ssize_t ft_wwn_show_attr_version(
@@ -471,7 +472,7 @@ static char *ft_get_fabric_wwn(struct se_portal_group *se_tpg)
 {
        struct ft_tpg *tpg = se_tpg->se_tpg_fabric_ptr;
 
-       return tpg->lport_acl->name;
+       return tpg->lport_wwn->name;
 }
 
 static u16 ft_get_tag(struct se_portal_group *se_tpg)
@@ -536,12 +537,13 @@ static struct target_core_fabric_ops ft_fabric_ops = {
        .queue_data_in =                ft_queue_data_in,
        .queue_status =                 ft_queue_status,
        .queue_tm_rsp =                 ft_queue_tm_resp,
+       .aborted_task =                 ft_aborted_task,
        /*
         * Setup function pointers for generic logic in
         * target_core_fabric_configfs.c
         */
-       .fabric_make_wwn =              &ft_add_lport,
-       .fabric_drop_wwn =              &ft_del_lport,
+       .fabric_make_wwn =              &ft_add_wwn,
+       .fabric_drop_wwn =              &ft_del_wwn,
        .fabric_make_tpg =              &ft_add_tpg,
        .fabric_drop_tpg =              &ft_del_tpg,
        .fabric_post_link =             NULL,