提交 ce7043fd 编写于 作者: C Christoph Hellwig 提交者: Nicholas Bellinger

target: remove ->fabric_cleanup_nodeacl

Instead we can clean up the list of default ACLs in core code.
Signed-off-by: NChristoph Hellwig <hch@lst.de>
Signed-off-by: NNicholas Bellinger <nab@linux-iscsi.org>
上级 572a1434
...@@ -779,14 +779,6 @@ static int lio_target_init_nodeacl(struct se_node_acl *se_nacl, ...@@ -779,14 +779,6 @@ static int lio_target_init_nodeacl(struct se_node_acl *se_nacl,
return 0; return 0;
} }
static void lio_target_cleanup_nodeacl( struct se_node_acl *se_nacl)
{
struct iscsi_node_acl *acl = container_of(se_nacl,
struct iscsi_node_acl, se_node_acl);
configfs_remove_default_groups(&acl->se_node_acl.acl_fabric_stat_group);
}
/* End items for lio_target_acl_cit */ /* End items for lio_target_acl_cit */
/* Start items for lio_target_tpg_attrib_cit */ /* Start items for lio_target_tpg_attrib_cit */
...@@ -1665,7 +1657,6 @@ const struct target_core_fabric_ops iscsi_ops = { ...@@ -1665,7 +1657,6 @@ const struct target_core_fabric_ops iscsi_ops = {
.fabric_make_np = lio_target_call_addnptotpg, .fabric_make_np = lio_target_call_addnptotpg,
.fabric_drop_np = lio_target_call_delnpfromtpg, .fabric_drop_np = lio_target_call_delnpfromtpg,
.fabric_init_nodeacl = lio_target_init_nodeacl, .fabric_init_nodeacl = lio_target_init_nodeacl,
.fabric_cleanup_nodeacl = lio_target_cleanup_nodeacl,
.tfc_discovery_attrs = lio_target_discovery_auth_attrs, .tfc_discovery_attrs = lio_target_discovery_auth_attrs,
.tfc_wwn_attrs = lio_target_wwn_attrs, .tfc_wwn_attrs = lio_target_wwn_attrs,
......
...@@ -338,10 +338,8 @@ static void target_fabric_nacl_base_release(struct config_item *item) ...@@ -338,10 +338,8 @@ static void target_fabric_nacl_base_release(struct config_item *item)
{ {
struct se_node_acl *se_nacl = container_of(to_config_group(item), struct se_node_acl *se_nacl = container_of(to_config_group(item),
struct se_node_acl, acl_group); struct se_node_acl, acl_group);
struct target_fabric_configfs *tf = se_nacl->se_tpg->se_tpg_wwn->wwn_tf;
if (tf->tf_ops->fabric_cleanup_nodeacl) configfs_remove_default_groups(&se_nacl->acl_fabric_stat_group);
tf->tf_ops->fabric_cleanup_nodeacl(se_nacl);
core_tpg_del_initiator_node_acl(se_nacl); core_tpg_del_initiator_node_acl(se_nacl);
} }
......
...@@ -87,7 +87,6 @@ struct target_core_fabric_ops { ...@@ -87,7 +87,6 @@ struct target_core_fabric_ops {
struct config_group *, const char *); struct config_group *, const char *);
void (*fabric_drop_np)(struct se_tpg_np *); void (*fabric_drop_np)(struct se_tpg_np *);
int (*fabric_init_nodeacl)(struct se_node_acl *, const char *); int (*fabric_init_nodeacl)(struct se_node_acl *, const char *);
void (*fabric_cleanup_nodeacl)(struct se_node_acl *);
struct configfs_attribute **tfc_discovery_attrs; struct configfs_attribute **tfc_discovery_attrs;
struct configfs_attribute **tfc_wwn_attrs; struct configfs_attribute **tfc_wwn_attrs;
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册