forked from Minki/linux
target: remove ->fabric_cleanup_nodeacl
Instead we can clean up the list of default ACLs in core code. Signed-off-by: Christoph Hellwig <hch@lst.de> Signed-off-by: Nicholas Bellinger <nab@linux-iscsi.org>
This commit is contained in:
parent
572a143489
commit
ce7043fd90
@ -779,14 +779,6 @@ static int lio_target_init_nodeacl(struct se_node_acl *se_nacl,
|
||||
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 */
|
||||
|
||||
/* Start items for lio_target_tpg_attrib_cit */
|
||||
@ -1665,7 +1657,6 @@ const struct target_core_fabric_ops iscsi_ops = {
|
||||
.fabric_make_np = lio_target_call_addnptotpg,
|
||||
.fabric_drop_np = lio_target_call_delnpfromtpg,
|
||||
.fabric_init_nodeacl = lio_target_init_nodeacl,
|
||||
.fabric_cleanup_nodeacl = lio_target_cleanup_nodeacl,
|
||||
|
||||
.tfc_discovery_attrs = lio_target_discovery_auth_attrs,
|
||||
.tfc_wwn_attrs = lio_target_wwn_attrs,
|
||||
|
@ -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, acl_group);
|
||||
struct target_fabric_configfs *tf = se_nacl->se_tpg->se_tpg_wwn->wwn_tf;
|
||||
|
||||
if (tf->tf_ops->fabric_cleanup_nodeacl)
|
||||
tf->tf_ops->fabric_cleanup_nodeacl(se_nacl);
|
||||
configfs_remove_default_groups(&se_nacl->acl_fabric_stat_group);
|
||||
core_tpg_del_initiator_node_acl(se_nacl);
|
||||
}
|
||||
|
||||
|
@ -87,7 +87,6 @@ struct target_core_fabric_ops {
|
||||
struct config_group *, const char *);
|
||||
void (*fabric_drop_np)(struct se_tpg_np *);
|
||||
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_wwn_attrs;
|
||||
|
Loading…
Reference in New Issue
Block a user