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

Commit b6a54b8d authored by Chris Zankel's avatar Chris Zankel Committed by Nicholas Bellinger
Browse files

target: remove initiatorname field in se_acl_lun 



From: Chris Zankel <czankel@purestorage.com>

The initiatorname field in se_acl_lun is only a copy of the same field
in se_node_acl, so remove it and use the version in se_node_acl where
needed (it's actually only used for pr_debug)

Signed-off-by: default avatarChris Zankel <czankel@purestorage.com>
Signed-off-by: default avatarSpencer Baugh <spencer.baugh@purestorage.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarNicholas Bellinger <nab@linux-iscsi.org>
parent 53c46995

drivers/target/target_core_device.c

+3 −5
Original line number Diff line number Diff line
@@ -620,8 +620,6 @@ struct se_lun_acl *core_dev_init_initiator_node_lun_acl( 


	lacl->mapped_lun = mapped_lun;

	lacl->se_lun_nacl = nacl;

	snprintf(lacl->initiatorname, TRANSPORT_IQN_LEN, "%s",

		 nacl->initiatorname);



	return lacl;

}
@@ -656,7 +654,7 @@ int core_dev_add_initiator_node_lun_acl( 
		" InitiatorNode: %s\n", tpg->se_tpg_tfo->get_fabric_name(),

		tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun, lacl->mapped_lun,

		(lun_access & TRANSPORT_LUNFLAGS_READ_WRITE) ? "RW" : "RO",

		lacl->initiatorname);

		nacl->initiatorname);

	/*

	 * Check to see if there are any existing persistent reservation APTPL

	 * pre-registrations that need to be enabled for this LUN ACL..
@@ -688,7 +686,7 @@ int core_dev_del_initiator_node_lun_acl( 
		" InitiatorNode: %s Mapped LUN: %llu\n",

		tpg->se_tpg_tfo->get_fabric_name(),

		tpg->se_tpg_tfo->tpg_get_tag(tpg), lun->unpacked_lun,

		lacl->initiatorname, lacl->mapped_lun);

		nacl->initiatorname, lacl->mapped_lun);



	return 0;

}
@@ -701,7 +699,7 @@ void core_dev_free_initiator_node_lun_acl( 
		" Mapped LUN: %llu\n", tpg->se_tpg_tfo->get_fabric_name(),

		tpg->se_tpg_tfo->tpg_get_tag(tpg),

		tpg->se_tpg_tfo->get_fabric_name(),

		lacl->initiatorname, lacl->mapped_lun);

		lacl->se_lun_nacl->initiatorname, lacl->mapped_lun);



	kfree(lacl);

}

drivers/target/target_core_fabric_configfs.c

+1 −1
Original line number Diff line number Diff line
@@ -203,7 +203,7 @@ static ssize_t target_fabric_mappedlun_store_write_protect( 
	pr_debug("%s_ConfigFS: Changed Initiator ACL: %s"

		" Mapped LUN: %llu Write Protect bit to %s\n",

		se_tpg->se_tpg_tfo->get_fabric_name(),

		lacl->initiatorname, lacl->mapped_lun, (op) ? "ON" : "OFF");

		se_nacl->initiatorname, lacl->mapped_lun, (op) ? "ON" : "OFF");



	return count;

include/target/target_core_base.h

+0 −1
Original line number Diff line number Diff line
@@ -593,7 +593,6 @@ struct se_ml_stat_grps { 
};



struct se_lun_acl {

	char			initiatorname[TRANSPORT_IQN_LEN];

	u64			mapped_lun;

	struct se_node_acl	*se_lun_nacl;

	struct se_lun		*se_lun;