Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16233799 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Nicholas Bellinger
Browse files

sbp_target: remove struct sbp_nacl 



Except for the embedded struct se_node_acl none of the fields were
ever used.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent a3b679e7

drivers/target/sbp/sbp_target.c

+3 −21
Original line number Diff line number Diff line
@@ -1714,24 +1714,14 @@ static u32 sbp_get_default_depth(struct se_portal_group *se_tpg) 


static struct se_node_acl *sbp_alloc_fabric_acl(struct se_portal_group *se_tpg)

{

	struct sbp_nacl *nacl;



	nacl = kzalloc(sizeof(struct sbp_nacl), GFP_KERNEL);

	if (!nacl) {

		pr_err("Unable to allocate struct sbp_nacl\n");

		return NULL;

	}



	return &nacl->se_node_acl;

	return kzalloc(sizeof(struct se_node_acl), GFP_KERNEL);

}



static void sbp_release_fabric_acl(

	struct se_portal_group *se_tpg,

	struct se_node_acl *se_nacl)

{

	struct sbp_nacl *nacl =

		container_of(se_nacl, struct sbp_nacl, se_node_acl);

	kfree(nacl);

	kfree(se_nacl);

}



static u32 sbp_tpg_get_inst_index(struct se_portal_group *se_tpg)
@@ -2106,7 +2096,6 @@ static struct se_node_acl *sbp_make_nodeacl( 
		const char *name)

{

	struct se_node_acl *se_nacl, *se_nacl_new;

	struct sbp_nacl *nacl;

	u64 guid = 0;

	u32 nexus_depth = 1;
@@ -2128,20 +2117,13 @@ static struct se_node_acl *sbp_make_nodeacl( 
		return se_nacl;

	}



	nacl = container_of(se_nacl, struct sbp_nacl, se_node_acl);

	nacl->guid = guid;

	sbp_format_wwn(nacl->iport_name, SBP_NAMELEN, guid);



	return se_nacl;

}



static void sbp_drop_nodeacl(struct se_node_acl *se_acl)

{

	struct sbp_nacl *nacl =

		container_of(se_acl, struct sbp_nacl, se_node_acl);



	core_tpg_del_initiator_node_acl(se_acl->se_tpg, se_acl, 1);

	kfree(nacl);

	kfree(se_acl);

}



static int sbp_post_link_lun(

drivers/target/sbp/sbp_target.h

+0 −9
Original line number Diff line number Diff line
@@ -151,15 +151,6 @@ struct sbp_session { 
	u64 reconnect_expires;

};



struct sbp_nacl {

	/* Initiator EUI-64 */

	u64 guid;

	/* ASCII formatted GUID for SBP Initiator port */

	char iport_name[SBP_NAMELEN];

	/* Returned by sbp_make_nodeacl() */

	struct se_node_acl se_node_acl;

};



struct sbp_tpg {

	/* Target portal group tag for TCM */

	u16 tport_tpgt;