Commit 30a5b62e authored by Maurizio Lombardi's avatar Maurizio Lombardi Committed by Martin K. Petersen
Browse files

scsi: target: iscsi: Remove the unused netif_timeout attribute 



This attribute has never been used, remove it.

Signed-off-by: default avatarMaurizio Lombardi <mlombard@redhat.com>
Link: https://lore.kernel.org/r/20230630155309.46061-1-mlombard@redhat.com


Reviewed-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 06c2afb8

drivers/target/iscsi/iscsi_target_configfs.c

+0 −2
Original line number Diff line number Diff line
@@ -783,7 +783,6 @@ CONFIGFS_ATTR(iscsi_tpg_attrib_, name) 


DEF_TPG_ATTRIB(authentication);

DEF_TPG_ATTRIB(login_timeout);

DEF_TPG_ATTRIB(netif_timeout);

DEF_TPG_ATTRIB(generate_node_acls);

DEF_TPG_ATTRIB(default_cmdsn_depth);

DEF_TPG_ATTRIB(cache_dynamic_acls);
@@ -799,7 +798,6 @@ DEF_TPG_ATTRIB(login_keys_workaround); 
static struct configfs_attribute *lio_target_tpg_attrib_attrs[] = {

	&iscsi_tpg_attrib_attr_authentication,

	&iscsi_tpg_attrib_attr_login_timeout,

	&iscsi_tpg_attrib_attr_netif_timeout,

	&iscsi_tpg_attrib_attr_generate_node_acls,

	&iscsi_tpg_attrib_attr_default_cmdsn_depth,

	&iscsi_tpg_attrib_attr_cache_dynamic_acls,

drivers/target/iscsi/iscsi_target_tpg.c

+0 −26
Original line number Diff line number Diff line
@@ -211,7 +211,6 @@ static void iscsit_set_default_tpg_attribs(struct iscsi_portal_group *tpg) 


	a->authentication = TA_AUTHENTICATION;

	a->login_timeout = TA_LOGIN_TIMEOUT;

	a->netif_timeout = TA_NETIF_TIMEOUT;

	a->default_cmdsn_depth = TA_DEFAULT_CMDSN_DEPTH;

	a->generate_node_acls = TA_GENERATE_NODE_ACLS;

	a->cache_dynamic_acls = TA_CACHE_DYNAMIC_ACLS;
@@ -666,31 +665,6 @@ int iscsit_ta_login_timeout( 
	return 0;

}



int iscsit_ta_netif_timeout(

	struct iscsi_portal_group *tpg,

	u32 netif_timeout)

{

	struct iscsi_tpg_attrib *a = &tpg->tpg_attrib;



	if (netif_timeout > TA_NETIF_TIMEOUT_MAX) {

		pr_err("Requested Network Interface Timeout %u larger"

			" than maximum %u\n", netif_timeout,

				TA_NETIF_TIMEOUT_MAX);

		return -EINVAL;

	} else if (netif_timeout < TA_NETIF_TIMEOUT_MIN) {

		pr_err("Requested Network Interface Timeout %u smaller"

			" than minimum %u\n", netif_timeout,

				TA_NETIF_TIMEOUT_MIN);

		return -EINVAL;

	}



	a->netif_timeout = netif_timeout;

	pr_debug("Set Network Interface Timeout to %u for"

		" Target Portal Group %hu\n", a->netif_timeout, tpg->tpgt);



	return 0;

}



int iscsit_ta_generate_node_acls(

	struct iscsi_portal_group *tpg,

	u32 flag)

drivers/target/iscsi/iscsi_target_tpg.h

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ extern int iscsit_tpg_del_network_portal(struct iscsi_portal_group *, 
			struct iscsi_tpg_np *);

extern int iscsit_ta_authentication(struct iscsi_portal_group *, u32);

extern int iscsit_ta_login_timeout(struct iscsi_portal_group *, u32);

extern int iscsit_ta_netif_timeout(struct iscsi_portal_group *, u32);

extern int iscsit_ta_generate_node_acls(struct iscsi_portal_group *, u32);

extern int iscsit_ta_default_cmdsn_depth(struct iscsi_portal_group *, u32);

extern int iscsit_ta_cache_dynamic_acls(struct iscsi_portal_group *, u32);

include/target/iscsi/iscsi_target_core.h

+0 −4
Original line number Diff line number Diff line
@@ -50,9 +50,6 @@ struct sock; 
#define TA_LOGIN_TIMEOUT		15

#define TA_LOGIN_TIMEOUT_MAX		30

#define TA_LOGIN_TIMEOUT_MIN		5

#define TA_NETIF_TIMEOUT		2

#define TA_NETIF_TIMEOUT_MAX		15

#define TA_NETIF_TIMEOUT_MIN		2

#define TA_GENERATE_NODE_ACLS		0

#define TA_DEFAULT_CMDSN_DEPTH		64

#define TA_DEFAULT_CMDSN_DEPTH_MAX	512
@@ -773,7 +770,6 @@ to_iscsi_nacl(struct se_node_acl *se_nacl) 
struct iscsi_tpg_attrib {

	u32			authentication;

	u32			login_timeout;

	u32			netif_timeout;

	u32			generate_node_acls;

	u32			cache_dynamic_acls;

	u32			default_cmdsn_depth;