scsi: target: iscsi: Rename iscsi_session to iscsit_session

The structure iscsi_session naming is used by the iSCSI initiator driver. Rename the target session to iscsit_session to have more readable code.

Max Gurtovoy committed 4 years ago

Commit 0873fe41 parent be36d6823 files · +125 −125Browse files

Unified · Split

23 files

drivers/target/iscsi/iscsi_target.c +14 −14
drivers/target/iscsi/iscsi_target.h +4 −4
drivers/target/iscsi/iscsi_target_configfs.c +6 −6
drivers/target/iscsi/iscsi_target_device.c +2 −2
drivers/target/iscsi/iscsi_target_device.h +3 −3
drivers/target/iscsi/iscsi_target_erl0.c +5 −5
drivers/target/iscsi/iscsi_target_erl0.h +4 −4
drivers/target/iscsi/iscsi_target_erl1.c +10 −10
drivers/target/iscsi/iscsi_target_erl1.h +5 −5
drivers/target/iscsi/iscsi_target_erl2.c +9 −9
drivers/target/iscsi/iscsi_target_erl2.h +5 −5
drivers/target/iscsi/iscsi_target_login.c +10 −10
drivers/target/iscsi/iscsi_target_nego.c +3 −3
drivers/target/iscsi/iscsi_target_nodeattrib.c +1 −1
drivers/target/iscsi/iscsi_target_seq_pdu_list.c +1 −1
drivers/target/iscsi/iscsi_target_stat.c +8 −8
drivers/target/iscsi/iscsi_target_tmr.c +3 −3
drivers/target/iscsi/iscsi_target_tpg.c +1 −1
drivers/target/iscsi/iscsi_target_tpg.h +2 −2
drivers/target/iscsi/iscsi_target_util.c +14 −14
drivers/target/iscsi/iscsi_target_util.h +9 −9
include/target/iscsi/iscsi_target_core.h +5 −5
include/target/iscsi/iscsi_transport.h +1 −1

drivers/target/iscsi/iscsi_target.c+14−14

@@ -2350,7 +2350,7 @@ reject: · 2349 unmodified lines
2350	int iscsit_logout_closesession(struct iscsit_cmd cmd, struct iscsit_conn conn)	2350	int iscsit_logout_closesession(struct iscsit_cmd cmd, struct iscsit_conn conn)
2351	{	2351	{
2352	struct iscsit_conn *conn_p;	2352	struct iscsit_conn *conn_p;
2353	struct iscsi_session *sess = conn->sess;	2353	struct iscsit_session *sess = conn->sess;
2354		2354
2355	pr_debug("Received logout request CLOSESESSION on CID: %hu"	2355	pr_debug("Received logout request CLOSESESSION on CID: %hu"
2356	" for SID: %u.\n", conn->cid, conn->sess->sid);	2356	" for SID: %u.\n", conn->cid, conn->sess->sid);
@@ -2380,7 +2380,7 @@ int iscsit_logout_closesession(struct iscsit_cmd cmd, struct iscsit_conn conn) · 23 unmodified lines
2380	int iscsit_logout_closeconnection(struct iscsit_cmd cmd, struct iscsit_conn conn)	2380	int iscsit_logout_closeconnection(struct iscsit_cmd cmd, struct iscsit_conn conn)
2381	{	2381	{
2382	struct iscsit_conn *l_conn;	2382	struct iscsit_conn *l_conn;
2383	struct iscsi_session *sess = conn->sess;	2383	struct iscsit_session *sess = conn->sess;
2384		2384
2385	pr_debug("Received logout request CLOSECONNECTION for CID:"	2385	pr_debug("Received logout request CLOSECONNECTION for CID:"
2386	" %hu on CID: %hu.\n", cmd->logout_cid, conn->cid);	2386	" %hu on CID: %hu.\n", cmd->logout_cid, conn->cid);
@@ -2427,7 +2427,7 @@ int iscsit_logout_closeconnection(struct iscsit_cmd cmd, struct iscsit_conn co · 40 unmodified lines
2427		2427
2428	int iscsit_logout_removeconnforrecovery(struct iscsit_cmd cmd, struct iscsit_conn conn)	2428	int iscsit_logout_removeconnforrecovery(struct iscsit_cmd cmd, struct iscsit_conn conn)
2429	{	2429	{
2430	struct iscsi_session *sess = conn->sess;	2430	struct iscsit_session *sess = conn->sess;
2431		2431
2432	pr_debug("Received explicit REMOVECONNFORRECOVERY logout for"	2432	pr_debug("Received explicit REMOVECONNFORRECOVERY logout for"
2433	" CID: %hu on CID: %hu.\n", cmd->logout_cid, conn->cid);	2433	" CID: %hu on CID: %hu.\n", cmd->logout_cid, conn->cid);
@@ -2901,7 +2901,7 @@ iscsit_build_logout_rsp(struct iscsit_cmd cmd, struct iscsit_conn conn, · 467 unmodified lines
2901	{	2901	{
2902	struct iscsit_conn *logout_conn = NULL;	2902	struct iscsit_conn *logout_conn = NULL;
2903	struct iscsi_conn_recovery *cr = NULL;	2903	struct iscsi_conn_recovery *cr = NULL;
2904	struct iscsi_session *sess = conn->sess;	2904	struct iscsit_session *sess = conn->sess;
2905	/*	2905	/*
2906	* The actual shutting down of Sessions and/or Connections	2906	* The actual shutting down of Sessions and/or Connections
2907	* for CLOSESESSION and CLOSECONNECTION Logout Requests	2907	* for CLOSESESSION and CLOSECONNECTION Logout Requests
@@ -4145,7 +4145,7 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn) · 1237 unmodified lines
4145	{	4145	{
4146	LIST_HEAD(tmp_list);	4146	LIST_HEAD(tmp_list);
4147	struct iscsit_cmd cmd = NULL, cmd_tmp = NULL;	4147	struct iscsit_cmd cmd = NULL, cmd_tmp = NULL;
4148	struct iscsi_session *sess = conn->sess;	4148	struct iscsit_session *sess = conn->sess;
4149	/*	4149	/*
4150	* We expect this function to only ever be called from either RX or TX	4150	* We expect this function to only ever be called from either RX or TX
4151	* thread context via iscsit_close_connection() once the other context	4151	* thread context via iscsit_close_connection() once the other context
@@ -4201,7 +4201,7 @@ int iscsit_close_connection( · 49 unmodified lines
4201	struct iscsit_conn *conn)	4201	struct iscsit_conn *conn)
4202	{	4202	{
4203	int conn_logout = (conn->conn_state == TARG_CONN_STATE_IN_LOGOUT);	4203	int conn_logout = (conn->conn_state == TARG_CONN_STATE_IN_LOGOUT);
4204	struct iscsi_session *sess = conn->sess;	4204	struct iscsit_session *sess = conn->sess;
4205		4205
4206	pr_debug("Closing iSCSI connection CID %hu on SID:"	4206	pr_debug("Closing iSCSI connection CID %hu on SID:"
4207	" %u\n", conn->cid, sess->sid);	4207	" %u\n", conn->cid, sess->sid);
@@ -4438,7 +4438,7 @@ int iscsit_close_connection( · 230 unmodified lines
4438	* If the iSCSI Session for the iSCSI Initiator Node exists,	4438	* If the iSCSI Session for the iSCSI Initiator Node exists,
4439	* forcefully shutdown the iSCSI NEXUS.	4439	* forcefully shutdown the iSCSI NEXUS.
4440	*/	4440	*/
4441	int iscsit_close_session(struct iscsi_session *sess, bool can_sleep)	4441	int iscsit_close_session(struct iscsit_session *sess, bool can_sleep)
4442	{	4442	{
4443	struct iscsi_portal_group *tpg = sess->tpg;	4443	struct iscsi_portal_group *tpg = sess->tpg;
4444	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	4444	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
@@ -4508,7 +4508,7 @@ int iscsit_close_session(struct iscsi_session *sess, bool can_sleep) · 63 unmodified lines
4508	static void iscsit_logout_post_handler_closesession(	4508	static void iscsit_logout_post_handler_closesession(
4509	struct iscsit_conn *conn)	4509	struct iscsit_conn *conn)
4510	{	4510	{
4511	struct iscsi_session *sess = conn->sess;	4511	struct iscsit_session *sess = conn->sess;
4512	int sleep = 1;	4512	int sleep = 1;
4513	/*	4513	/*
4514	* Traditional iscsi/tcp will invoke this logic from TX thread	4514	* Traditional iscsi/tcp will invoke this logic from TX thread
@@ -4557,7 +4557,7 @@ static void iscsit_logout_post_handler_diffcid( · 42 unmodified lines
4557	u16 cid)	4557	u16 cid)
4558	{	4558	{
4559	struct iscsit_conn *l_conn;	4559	struct iscsit_conn *l_conn;
4560	struct iscsi_session *sess = conn->sess;	4560	struct iscsit_session *sess = conn->sess;
4561	bool conn_found = false;	4561	bool conn_found = false;
4562		4562
4563	if (!sess)	4563	if (!sess)
@@ -4649,7 +4649,7 @@ int iscsit_logout_post_handler( · 85 unmodified lines
4649	}	4649	}
4650	EXPORT_SYMBOL(iscsit_logout_post_handler);	4650	EXPORT_SYMBOL(iscsit_logout_post_handler);
4651		4651
4652	void iscsit_fail_session(struct iscsi_session *sess)	4652	void iscsit_fail_session(struct iscsit_session *sess)
4653	{	4653	{
4654	struct iscsit_conn *conn;	4654	struct iscsit_conn *conn;
4655		4655
@@ -4665,7 +4665,7 @@ void iscsit_fail_session(struct iscsi_session *sess) · 9 unmodified lines
4665	}	4665	}
4666		4666
4667	void iscsit_stop_session(	4667	void iscsit_stop_session(
4668	struct iscsi_session *sess,	4668	struct iscsit_session *sess,
4669	int session_sleep,	4669	int session_sleep,
4670	int connection_sleep)	4670	int connection_sleep)
4671	{	4671	{
@@ -4712,7 +4712,7 @@ void iscsit_stop_session( · 40 unmodified lines
4712		4712
4713	int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)	4713	int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)
4714	{	4714	{
4715	struct iscsi_session *sess;	4715	struct iscsit_session *sess;
4716	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	4716	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
4717	struct se_session se_sess, se_sess_tmp;	4717	struct se_session se_sess, se_sess_tmp;
4718	LIST_HEAD(free_list);	4718	LIST_HEAD(free_list);
@@ -4726,7 +4726,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force) · 7 unmodified lines
4726		4726
4727	list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list,	4727	list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list,
4728	sess_list) {	4728	sess_list) {
4729	sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;	4729	sess = (struct iscsit_session *)se_sess->fabric_sess_ptr;
4730		4730
4731	spin_lock(&sess->conn_lock);	4731	spin_lock(&sess->conn_lock);
4732	if (atomic_read(&sess->session_fall_back_to_erl0) \|\|	4732	if (atomic_read(&sess->session_fall_back_to_erl0) \|\|
@@ -4747,7 +4747,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force) · 14 unmodified lines
4747	spin_unlock_bh(&se_tpg->session_lock);	4747	spin_unlock_bh(&se_tpg->session_lock);
4748		4748
4749	list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) {	4749	list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) {
4750	sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;	4750	sess = (struct iscsit_session *)se_sess->fabric_sess_ptr;
4751		4751
4752	list_del_init(&se_sess->sess_list);	4752	list_del_init(&se_sess->sess_list);
4753	iscsit_stop_session(sess, 1, 1);	4753	iscsit_stop_session(sess, 1, 1);

drivers/target/iscsi/iscsi_target.h+4−4

@@ -9,7 +9,7 @@ struct iscsit_cmd; · 8 unmodified lines
9	struct iscsit_conn;	9	struct iscsit_conn;
10	struct iscsi_np;	10	struct iscsi_np;
11	struct iscsi_portal_group;	11	struct iscsi_portal_group;
12	struct iscsi_session;	12	struct iscsit_session;
13	struct iscsi_tpg_np;	13	struct iscsi_tpg_np;
14	struct kref;	14	struct kref;
15	struct sockaddr_storage;	15	struct sockaddr_storage;
@@ -41,9 +41,9 @@ extern void iscsit_thread_get_cpumask(struct iscsit_conn *); · 25 unmodified lines
41	extern int iscsi_target_tx_thread(void *);	41	extern int iscsi_target_tx_thread(void *);
42	extern int iscsi_target_rx_thread(void *);	42	extern int iscsi_target_rx_thread(void *);
43	extern int iscsit_close_connection(struct iscsit_conn *);	43	extern int iscsit_close_connection(struct iscsit_conn *);
44	extern int iscsit_close_session(struct iscsi_session *, bool can_sleep);	44	extern int iscsit_close_session(struct iscsit_session *, bool can_sleep);
45	extern void iscsit_fail_session(struct iscsi_session *);	45	extern void iscsit_fail_session(struct iscsit_session *);
46	extern void iscsit_stop_session(struct iscsi_session *, int, int);	46	extern void iscsit_stop_session(struct iscsit_session *, int, int);
47	extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int);	47	extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int);
48		48
49	extern struct iscsit_global *iscsit_global;	49	extern struct iscsit_global *iscsit_global;

drivers/target/iscsi/iscsi_target_configfs.c+6−6

@@ -443,7 +443,7 @@ static ssize_t iscsi_nacl_param_##name##_show(struct config_item *item, \ · 442 unmodified lines
443	char *page) \	443	char *page) \
444	{ \	444	{ \
445	struct se_node_acl *se_nacl = param_to_nacl(item); \	445	struct se_node_acl *se_nacl = param_to_nacl(item); \
446	struct iscsi_session *sess; \	446	struct iscsit_session *sess; \
447	struct se_session *se_sess; \	447	struct se_session *se_sess; \
448	ssize_t rb; \	448	ssize_t rb; \
449	\	449	\
@@ -498,7 +498,7 @@ static struct configfs_attribute *lio_target_nacl_param_attrs[] = { · 48 unmodified lines
498	static ssize_t lio_target_nacl_info_show(struct config_item item, char page)	498	static ssize_t lio_target_nacl_info_show(struct config_item item, char page)
499	{	499	{
500	struct se_node_acl *se_nacl = acl_to_nacl(item);	500	struct se_node_acl *se_nacl = acl_to_nacl(item);
501	struct iscsi_session *sess;	501	struct iscsit_session *sess;
502	struct iscsit_conn *conn;	502	struct iscsit_conn *conn;
503	struct se_session *se_sess;	503	struct se_session *se_sess;
504	ssize_t rb = 0;	504	ssize_t rb = 0;
@@ -1347,7 +1347,7 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd) · 842 unmodified lines
1347		1347
1348	static u32 lio_sess_get_index(struct se_session *se_sess)	1348	static u32 lio_sess_get_index(struct se_session *se_sess)
1349	{	1349	{
1350	struct iscsi_session *sess = se_sess->fabric_sess_ptr;	1350	struct iscsit_session *sess = se_sess->fabric_sess_ptr;
1351		1351
1352	return sess->session_index;	1352	return sess->session_index;
1353	}	1353	}
@@ -1357,7 +1357,7 @@ static u32 lio_sess_get_initiator_sid( · 3 unmodified lines
1357	unsigned char *buf,	1357	unsigned char *buf,
1358	u32 size)	1358	u32 size)
1359	{	1359	{
1360	struct iscsi_session *sess = se_sess->fabric_sess_ptr;	1360	struct iscsit_session *sess = se_sess->fabric_sess_ptr;
1361	/*	1361	/*
1362	* iSCSI Initiator Session Identifier from RFC-3720.	1362	* iSCSI Initiator Session Identifier from RFC-3720.
1363	*/	1363	*/
@@ -1468,11 +1468,11 @@ static int lio_tpg_check_prot_fabric_only( · 104 unmodified lines
1468		1468
1469	/*	1469	/*
1470	* This function calls iscsit_inc_session_usage_count() on the	1470	* This function calls iscsit_inc_session_usage_count() on the
1471	* struct iscsi_session in question.	1471	* struct iscsit_session in question.
1472	*/	1472	*/
1473	static void lio_tpg_close_session(struct se_session *se_sess)	1473	static void lio_tpg_close_session(struct se_session *se_sess)
1474	{	1474	{
1475	struct iscsi_session *sess = se_sess->fabric_sess_ptr;	1475	struct iscsit_session *sess = se_sess->fabric_sess_ptr;
1476	struct se_portal_group *se_tpg = &sess->tpg->tpg_se_tpg;	1476	struct se_portal_group *se_tpg = &sess->tpg->tpg_se_tpg;
1477		1477
1478	spin_lock_bh(&se_tpg->session_lock);	1478	spin_lock_bh(&se_tpg->session_lock);

drivers/target/iscsi/iscsi_target_device.c+2−2

@@ -17,7 +17,7 @@ · 16 unmodified lines
17	#include "iscsi_target_tpg.h"	17	#include "iscsi_target_tpg.h"
18	#include "iscsi_target_util.h"	18	#include "iscsi_target_util.h"
19		19
20	void iscsit_determine_maxcmdsn(struct iscsi_session *sess)	20	void iscsit_determine_maxcmdsn(struct iscsit_session *sess)
21	{	21	{
22	struct se_node_acl *se_nacl;	22	struct se_node_acl *se_nacl;
23		23
@@ -42,7 +42,7 @@ void iscsit_determine_maxcmdsn(struct iscsi_session *sess) · 18 unmodified lines
42	atomic_add(se_nacl->queue_depth - 1, &sess->max_cmd_sn);	42	atomic_add(se_nacl->queue_depth - 1, &sess->max_cmd_sn);
43	}	43	}
44		44
45	void iscsit_increment_maxcmdsn(struct iscsit_cmd cmd, struct iscsi_session sess)	45	void iscsit_increment_maxcmdsn(struct iscsit_cmd cmd, struct iscsit_session sess)
46	{	46	{
47	u32 max_cmd_sn;	47	u32 max_cmd_sn;
48		48

drivers/target/iscsi/iscsi_target_device.h+3−3

@@ -3,9 +3,9 @@ · 2 unmodified lines
3	#define ISCSI_TARGET_DEVICE_H	3	#define ISCSI_TARGET_DEVICE_H
4		4
5	struct iscsit_cmd;	5	struct iscsit_cmd;
6	struct iscsi_session;	6	struct iscsit_session;
7		7
8	extern void iscsit_determine_maxcmdsn(struct iscsi_session *);	8	extern void iscsit_determine_maxcmdsn(struct iscsit_session *);
9	extern void iscsit_increment_maxcmdsn(struct iscsit_cmd , struct iscsi_session );	9	extern void iscsit_increment_maxcmdsn(struct iscsit_cmd , struct iscsit_session );
10		10
11	#endif /* ISCSI_TARGET_DEVICE_H */	11	#endif /* ISCSI_TARGET_DEVICE_H */

drivers/target/iscsi/iscsi_target_erl0.c+5−5

drivers/target/iscsi/iscsi_target_erl0.h+4−4

drivers/target/iscsi/iscsi_target_erl1.c+10−10

@@ -767,7 +767,7 @@ static struct iscsi_ooo_cmdsn *iscsit_allocate_ooo_cmdsn(void) · 766 unmodified lines
767	}	767	}
768		768
769	static int iscsit_attach_ooo_cmdsn(	769	static int iscsit_attach_ooo_cmdsn(
770	struct iscsi_session *sess,	770	struct iscsit_session *sess,
771	struct iscsi_ooo_cmdsn *ooo_cmdsn)	771	struct iscsi_ooo_cmdsn *ooo_cmdsn)
772	{	772	{
773	struct iscsi_ooo_cmdsn ooo_tail, ooo_tmp;	773	struct iscsi_ooo_cmdsn ooo_tail, ooo_tmp;
@@ -815,10 +815,10 @@ static int iscsit_attach_ooo_cmdsn( · 41 unmodified lines
815		815
816	/*	816	/*
817	* Removes an struct iscsi_ooo_cmdsn from a session's list,	817	* Removes an struct iscsi_ooo_cmdsn from a session's list,
818	* called with struct iscsi_session->cmdsn_mutex held.	818	* called with struct iscsit_session->cmdsn_mutex held.
819	*/	819	*/
820	void iscsit_remove_ooo_cmdsn(	820	void iscsit_remove_ooo_cmdsn(
821	struct iscsi_session *sess,	821	struct iscsit_session *sess,
822	struct iscsi_ooo_cmdsn *ooo_cmdsn)	822	struct iscsi_ooo_cmdsn *ooo_cmdsn)
823	{	823	{
824	list_del(&ooo_cmdsn->ooo_list);	824	list_del(&ooo_cmdsn->ooo_list);
@@ -828,7 +828,7 @@ void iscsit_remove_ooo_cmdsn( · 3 unmodified lines
828	void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *conn)	828	void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *conn)
829	{	829	{
830	struct iscsi_ooo_cmdsn *ooo_cmdsn;	830	struct iscsi_ooo_cmdsn *ooo_cmdsn;
831	struct iscsi_session *sess = conn->sess;	831	struct iscsit_session *sess = conn->sess;
832		832
833	mutex_lock(&sess->cmdsn_mutex);	833	mutex_lock(&sess->cmdsn_mutex);
834	list_for_each_entry(ooo_cmdsn, &sess->sess_ooo_cmdsn_list, ooo_list) {	834	list_for_each_entry(ooo_cmdsn, &sess->sess_ooo_cmdsn_list, ooo_list) {
@@ -840,7 +840,7 @@ void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *conn) · 5 unmodified lines
840	mutex_unlock(&sess->cmdsn_mutex);	840	mutex_unlock(&sess->cmdsn_mutex);
841	}	841	}
842		842
843	int iscsit_execute_ooo_cmdsns(struct iscsi_session *sess)	843	int iscsit_execute_ooo_cmdsns(struct iscsit_session *sess)
844	{	844	{
845	int ooo_count = 0;	845	int ooo_count = 0;
846	struct iscsit_cmd *cmd = NULL;	846	struct iscsit_cmd *cmd = NULL;
@@ -994,7 +994,7 @@ int iscsit_execute_cmd(struct iscsit_cmd *cmd, int ooo) · 147 unmodified lines
994	return 0;	994	return 0;
995	}	995	}
996		996
997	void iscsit_free_all_ooo_cmdsns(struct iscsi_session *sess)	997	void iscsit_free_all_ooo_cmdsns(struct iscsit_session *sess)
998	{	998	{
999	struct iscsi_ooo_cmdsn ooo_cmdsn, ooo_cmdsn_tmp;	999	struct iscsi_ooo_cmdsn ooo_cmdsn, ooo_cmdsn_tmp;
1000		1000
@@ -1009,7 +1009,7 @@ void iscsit_free_all_ooo_cmdsns(struct iscsi_session *sess) · 8 unmodified lines
1009	}	1009	}
1010		1010
1011	int iscsit_handle_ooo_cmdsn(	1011	int iscsit_handle_ooo_cmdsn(
1012	struct iscsi_session *sess,	1012	struct iscsit_session *sess,
1013	struct iscsit_cmd *cmd,	1013	struct iscsit_cmd *cmd,
1014	u32 cmdsn)	1014	u32 cmdsn)
1015	{	1015	{
@@ -1097,7 +1097,7 @@ void iscsit_handle_dataout_timeout(struct timer_list *t) · 81 unmodified lines
1097	u32 r2t_length = 0, r2t_offset = 0;	1097	u32 r2t_length = 0, r2t_offset = 0;
1098	struct iscsit_cmd *cmd = from_timer(cmd, t, dataout_timer);	1098	struct iscsit_cmd *cmd = from_timer(cmd, t, dataout_timer);
1099	struct iscsit_conn *conn = cmd->conn;	1099	struct iscsit_conn *conn = cmd->conn;
1100	struct iscsi_session *sess = NULL;	1100	struct iscsit_session *sess = NULL;
1101	struct iscsi_node_attrib *na;	1101	struct iscsi_node_attrib *na;
1102		1102
1103	iscsit_inc_conn_usage_count(conn);	1103	iscsit_inc_conn_usage_count(conn);
@@ -1182,7 +1182,7 @@ failure: · 78 unmodified lines
1182	void iscsit_mod_dataout_timer(struct iscsit_cmd *cmd)	1182	void iscsit_mod_dataout_timer(struct iscsit_cmd *cmd)
1183	{	1183	{
1184	struct iscsit_conn *conn = cmd->conn;	1184	struct iscsit_conn *conn = cmd->conn;
1185	struct iscsi_session *sess = conn->sess;	1185	struct iscsit_session *sess = conn->sess;
1186	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	1186	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
1187		1187
1188	spin_lock_bh(&cmd->dataout_timeout_lock);	1188	spin_lock_bh(&cmd->dataout_timeout_lock);
@@ -1202,7 +1202,7 @@ void iscsit_start_dataout_timer( · 13 unmodified lines
1202	struct iscsit_cmd *cmd,	1202	struct iscsit_cmd *cmd,
1203	struct iscsit_conn *conn)	1203	struct iscsit_conn *conn)
1204	{	1204	{
1205	struct iscsi_session *sess = conn->sess;	1205	struct iscsit_session *sess = conn->sess;
1206	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	1206	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
1207		1207
1208	lockdep_assert_held(&cmd->dataout_timeout_lock);	1208	lockdep_assert_held(&cmd->dataout_timeout_lock);

drivers/target/iscsi/iscsi_target_erl1.h+5−5

drivers/target/iscsi/iscsi_target_erl2.c+9−9

@@ -74,7 +74,7 @@ void iscsit_create_conn_recovery_dataout_values( · 73 unmodified lines
74	}	74	}
75		75
76	static int iscsit_attach_active_connection_recovery_entry(	76	static int iscsit_attach_active_connection_recovery_entry(
77	struct iscsi_session *sess,	77	struct iscsit_session *sess,
78	struct iscsi_conn_recovery *cr)	78	struct iscsi_conn_recovery *cr)
79	{	79	{
80	spin_lock(&sess->cr_a_lock);	80	spin_lock(&sess->cr_a_lock);
@@ -85,7 +85,7 @@ static int iscsit_attach_active_connection_recovery_entry( · 4 unmodified lines
85	}	85	}
86		86
87	static int iscsit_attach_inactive_connection_recovery_entry(	87	static int iscsit_attach_inactive_connection_recovery_entry(
88	struct iscsi_session *sess,	88	struct iscsit_session *sess,
89	struct iscsi_conn_recovery *cr)	89	struct iscsi_conn_recovery *cr)
90	{	90	{
91	spin_lock(&sess->cr_i_lock);	91	spin_lock(&sess->cr_i_lock);
@@ -100,7 +100,7 @@ static int iscsit_attach_inactive_connection_recovery_entry( · 8 unmodified lines
100	}	100	}
101		101
102	struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(	102	struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(
103	struct iscsi_session *sess,	103	struct iscsit_session *sess,
104	u16 cid)	104	u16 cid)
105	{	105	{
106	struct iscsi_conn_recovery *cr;	106	struct iscsi_conn_recovery *cr;
@@ -117,7 +117,7 @@ struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry( · 10 unmodified lines
117	return NULL;	117	return NULL;
118	}	118	}
119		119
120	void iscsit_free_connection_recovery_entries(struct iscsi_session *sess)	120	void iscsit_free_connection_recovery_entries(struct iscsit_session *sess)
121	{	121	{
122	struct iscsit_cmd cmd, cmd_tmp;	122	struct iscsit_cmd cmd, cmd_tmp;
123	struct iscsi_conn_recovery cr, cr_tmp;	123	struct iscsi_conn_recovery cr, cr_tmp;
@@ -169,7 +169,7 @@ void iscsit_free_connection_recovery_entries(struct iscsi_session *sess) · 45 unmodified lines
169		169
170	int iscsit_remove_active_connection_recovery_entry(	170	int iscsit_remove_active_connection_recovery_entry(
171	struct iscsi_conn_recovery *cr,	171	struct iscsi_conn_recovery *cr,
172	struct iscsi_session *sess)	172	struct iscsit_session *sess)
173	{	173	{
174	spin_lock(&sess->cr_a_lock);	174	spin_lock(&sess->cr_a_lock);
175	list_del(&cr->cr_list);	175	list_del(&cr->cr_list);
@@ -186,7 +186,7 @@ int iscsit_remove_active_connection_recovery_entry( · 10 unmodified lines
186		186
187	static void iscsit_remove_inactive_connection_recovery_entry(	187	static void iscsit_remove_inactive_connection_recovery_entry(
188	struct iscsi_conn_recovery *cr,	188	struct iscsi_conn_recovery *cr,
189	struct iscsi_session *sess)	189	struct iscsit_session *sess)
190	{	190	{
191	spin_lock(&sess->cr_i_lock);	191	spin_lock(&sess->cr_i_lock);
192	list_del(&cr->cr_list);	192	list_del(&cr->cr_list);
@@ -198,7 +198,7 @@ static void iscsit_remove_inactive_connection_recovery_entry( · 5 unmodified lines
198	*/	198	*/
199	int iscsit_remove_cmd_from_connection_recovery(	199	int iscsit_remove_cmd_from_connection_recovery(
200	struct iscsit_cmd *cmd,	200	struct iscsit_cmd *cmd,
201	struct iscsi_session *sess)	201	struct iscsit_session *sess)
202	{	202	{
203	struct iscsi_conn_recovery *cr;	203	struct iscsi_conn_recovery *cr;
204		204
@@ -219,7 +219,7 @@ void iscsit_discard_cr_cmds_by_expstatsn( · 14 unmodified lines
219	{	219	{
220	u32 dropped_count = 0;	220	u32 dropped_count = 0;
221	struct iscsit_cmd cmd, cmd_tmp;	221	struct iscsit_cmd cmd, cmd_tmp;
222	struct iscsi_session *sess = cr->sess;	222	struct iscsit_session *sess = cr->sess;
223		223
224	spin_lock(&cr->conn_recovery_cmd_lock);	224	spin_lock(&cr->conn_recovery_cmd_lock);
225	list_for_each_entry_safe(cmd, cmd_tmp,	225	list_for_each_entry_safe(cmd, cmd_tmp,
@@ -268,7 +268,7 @@ int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsit_conn *conn) · 42 unmodified lines
268	u32 dropped_count = 0;	268	u32 dropped_count = 0;
269	struct iscsit_cmd cmd, cmd_tmp;	269	struct iscsit_cmd cmd, cmd_tmp;
270	struct iscsi_ooo_cmdsn ooo_cmdsn, ooo_cmdsn_tmp;	270	struct iscsi_ooo_cmdsn ooo_cmdsn, ooo_cmdsn_tmp;
271	struct iscsi_session *sess = conn->sess;	271	struct iscsit_session *sess = conn->sess;
272		272
273	mutex_lock(&sess->cmdsn_mutex);	273	mutex_lock(&sess->cmdsn_mutex);
274	list_for_each_entry_safe(ooo_cmdsn, ooo_cmdsn_tmp,	274	list_for_each_entry_safe(ooo_cmdsn, ooo_cmdsn_tmp,

drivers/target/iscsi/iscsi_target_erl2.h+5−5

@@ -7,17 +7,17 @@ · 6 unmodified lines
7	struct iscsit_cmd;	7	struct iscsit_cmd;
8	struct iscsit_conn;	8	struct iscsit_conn;
9	struct iscsi_conn_recovery;	9	struct iscsi_conn_recovery;
10	struct iscsi_session;	10	struct iscsit_session;
11		11
12	extern void iscsit_create_conn_recovery_datain_values(struct iscsit_cmd *, __be32);	12	extern void iscsit_create_conn_recovery_datain_values(struct iscsit_cmd *, __be32);
13	extern void iscsit_create_conn_recovery_dataout_values(struct iscsit_cmd *);	13	extern void iscsit_create_conn_recovery_dataout_values(struct iscsit_cmd *);
14	extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(	14	extern struct iscsi_conn_recovery *iscsit_get_inactive_connection_recovery_entry(
15	struct iscsi_session *, u16);	15	struct iscsit_session *, u16);
16	extern void iscsit_free_connection_recovery_entries(struct iscsi_session *);	16	extern void iscsit_free_connection_recovery_entries(struct iscsit_session *);
17	extern int iscsit_remove_active_connection_recovery_entry(	17	extern int iscsit_remove_active_connection_recovery_entry(
18	struct iscsi_conn_recovery , struct iscsi_session );	18	struct iscsi_conn_recovery , struct iscsit_session );
19	extern int iscsit_remove_cmd_from_connection_recovery(struct iscsit_cmd *,	19	extern int iscsit_remove_cmd_from_connection_recovery(struct iscsit_cmd *,
20	struct iscsi_session *);	20	struct iscsit_session *);
21	extern void iscsit_discard_cr_cmds_by_expstatsn(struct iscsi_conn_recovery *, u32);	21	extern void iscsit_discard_cr_cmds_by_expstatsn(struct iscsi_conn_recovery *, u32);
22	extern int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsit_conn *);	22	extern int iscsit_discard_unacknowledged_ooo_cmdsns_for_conn(struct iscsit_conn *);
23	extern int iscsit_prepare_cmds_for_reallegiance(struct iscsit_conn *);	23	extern int iscsit_prepare_cmds_for_reallegiance(struct iscsit_conn *);

drivers/target/iscsi/iscsi_target_login.c+10−10

@@ -133,7 +133,7 @@ int iscsi_check_for_session_reinstatement(struct iscsit_conn *conn) · 132 unmodified lines
133	int sessiontype;	133	int sessiontype;
134	struct iscsi_param initiatorname_param = NULL, sessiontype_param = NULL;	134	struct iscsi_param initiatorname_param = NULL, sessiontype_param = NULL;
135	struct iscsi_portal_group *tpg = conn->tpg;	135	struct iscsi_portal_group *tpg = conn->tpg;
136	struct iscsi_session sess = NULL, sess_p = NULL;	136	struct iscsit_session sess = NULL, sess_p = NULL;
137	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	137	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
138	struct se_session se_sess, se_sess_tmp;	138	struct se_session se_sess, se_sess_tmp;
139		139
@@ -204,7 +204,7 @@ int iscsi_check_for_session_reinstatement(struct iscsit_conn *conn) · 64 unmodified lines
204	}	204	}
205		205
206	static int iscsi_login_set_conn_values(	206	static int iscsi_login_set_conn_values(
207	struct iscsi_session *sess,	207	struct iscsit_session *sess,
208	struct iscsit_conn *conn,	208	struct iscsit_conn *conn,
209	__be16 cid)	209	__be16 cid)
210	{	210	{
@@ -256,11 +256,11 @@ static int iscsi_login_zero_tsih_s1( · 45 unmodified lines
256	struct iscsit_conn *conn,	256	struct iscsit_conn *conn,
257	unsigned char *buf)	257	unsigned char *buf)
258	{	258	{
259	struct iscsi_session *sess = NULL;	259	struct iscsit_session *sess = NULL;
260	struct iscsi_login_req pdu = (struct iscsi_login_req )buf;	260	struct iscsi_login_req pdu = (struct iscsi_login_req )buf;
261	int ret;	261	int ret;
262		262
263	sess = kzalloc(sizeof(struct iscsi_session), GFP_KERNEL);	263	sess = kzalloc(sizeof(struct iscsit_session), GFP_KERNEL);
264	if (!sess) {	264	if (!sess) {
265	iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,	265	iscsit_tx_login_rsp(conn, ISCSI_STATUS_CLS_TARGET_ERR,
266	ISCSI_LOGIN_STATUS_NO_RESOURCES);	266	ISCSI_LOGIN_STATUS_NO_RESOURCES);
@@ -340,7 +340,7 @@ static int iscsi_login_zero_tsih_s2( · 73 unmodified lines
340	struct iscsit_conn *conn)	340	struct iscsit_conn *conn)
341	{	341	{
342	struct iscsi_node_attrib *na;	342	struct iscsi_node_attrib *na;
343	struct iscsi_session *sess = conn->sess;	343	struct iscsit_session *sess = conn->sess;
344	bool iser = false;	344	bool iser = false;
345		345
346	sess->tpg = conn->tpg;	346	sess->tpg = conn->tpg;
@@ -474,7 +474,7 @@ static int iscsi_login_non_zero_tsih_s2( · 127 unmodified lines
474	unsigned char *buf)	474	unsigned char *buf)
475	{	475	{
476	struct iscsi_portal_group *tpg = conn->tpg;	476	struct iscsi_portal_group *tpg = conn->tpg;
477	struct iscsi_session sess = NULL, sess_p = NULL;	477	struct iscsit_session sess = NULL, sess_p = NULL;
478	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	478	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
479	struct se_session se_sess, se_sess_tmp;	479	struct se_session se_sess, se_sess_tmp;
480	struct iscsi_login_req pdu = (struct iscsi_login_req )buf;	480	struct iscsi_login_req pdu = (struct iscsi_login_req )buf;
@@ -484,7 +484,7 @@ static int iscsi_login_non_zero_tsih_s2( · 3 unmodified lines
484	list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list,	484	list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list,
485	sess_list) {	485	sess_list) {
486		486
487	sess_p = (struct iscsi_session *)se_sess->fabric_sess_ptr;	487	sess_p = (struct iscsit_session *)se_sess->fabric_sess_ptr;
488	if (atomic_read(&sess_p->session_fall_back_to_erl0) \|\|	488	if (atomic_read(&sess_p->session_fall_back_to_erl0) \|\|
489	atomic_read(&sess_p->session_logout) \|\|	489	atomic_read(&sess_p->session_logout) \|\|
490	atomic_read(&sess_p->session_close) \|\|	490	atomic_read(&sess_p->session_close) \|\|
@@ -552,7 +552,7 @@ int iscsi_login_post_auth_non_zero_tsih( · 61 unmodified lines
552	{	552	{
553	struct iscsit_conn *conn_ptr = NULL;	553	struct iscsit_conn *conn_ptr = NULL;
554	struct iscsi_conn_recovery *cr = NULL;	554	struct iscsi_conn_recovery *cr = NULL;
555	struct iscsi_session *sess = conn->sess;	555	struct iscsit_session *sess = conn->sess;
556		556
557	/*	557	/*
558	* By following item 5 in the login table, if we have found	558	* By following item 5 in the login table, if we have found
@@ -614,7 +614,7 @@ int iscsi_login_post_auth_non_zero_tsih( · 55 unmodified lines
614		614
615	static void iscsi_post_login_start_timers(struct iscsit_conn *conn)	615	static void iscsi_post_login_start_timers(struct iscsit_conn *conn)
616	{	616	{
617	struct iscsi_session *sess = conn->sess;	617	struct iscsit_session *sess = conn->sess;
618	/*	618	/*
619	* FIXME: Unsolicited NopIN support for ISER	619	* FIXME: Unsolicited NopIN support for ISER
620	*/	620	*/
@@ -677,7 +677,7 @@ void iscsi_post_login_handler( · 56 unmodified lines
677	u8 zero_tsih)	677	u8 zero_tsih)
678	{	678	{
679	int stop_timer = 0;	679	int stop_timer = 0;
680	struct iscsi_session *sess = conn->sess;	680	struct iscsit_session *sess = conn->sess;
681	struct se_session *se_sess = sess->se_sess;	681	struct se_session *se_sess = sess->se_sess;
682	struct iscsi_portal_group *tpg = sess->tpg;	682	struct iscsi_portal_group *tpg = sess->tpg;
683	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	683	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;

drivers/target/iscsi/iscsi_target_nego.c+3−3

@@ -102,7 +102,7 @@ static u32 iscsi_handle_authentication( · 101 unmodified lines
102	int *out_length,	102	int *out_length,
103	unsigned char *authtype)	103	unsigned char *authtype)
104	{	104	{
105	struct iscsi_session *sess = conn->sess;	105	struct iscsit_session *sess = conn->sess;
106	struct iscsi_node_auth *auth;	106	struct iscsi_node_auth *auth;
107	struct iscsi_node_acl *iscsi_nacl;	107	struct iscsi_node_acl *iscsi_nacl;
108	struct iscsi_portal_group *iscsi_tpg;	108	struct iscsi_portal_group *iscsi_tpg;
@@ -1059,7 +1059,7 @@ int iscsi_target_locate_portal( · 950 unmodified lines
1059	{	1059	{
1060	char i_buf = NULL, s_buf = NULL, *t_buf = NULL;	1060	char i_buf = NULL, s_buf = NULL, *t_buf = NULL;
1061	char tmpbuf, start = NULL, end = NULL, key, *value;	1061	char tmpbuf, start = NULL, end = NULL, key, *value;
1062	struct iscsi_session *sess = conn->sess;	1062	struct iscsit_session *sess = conn->sess;
1063	struct iscsi_tiqn *tiqn;	1063	struct iscsi_tiqn *tiqn;
1064	struct iscsi_tpg_np *tpg_np = NULL;	1064	struct iscsi_tpg_np *tpg_np = NULL;
1065	struct iscsi_login_req *login_req;	1065	struct iscsi_login_req *login_req;
@@ -1232,7 +1232,7 @@ get_target: · 166 unmodified lines
1232		1232
1233	/*	1233	/*
1234	* conn->sess->node_acl will be set when the referenced	1234	* conn->sess->node_acl will be set when the referenced
1235	* struct iscsi_session is located from received ISID+TSIH in	1235	* struct iscsit_session is located from received ISID+TSIH in
1236	* iscsi_login_non_zero_tsih_s2().	1236	* iscsi_login_non_zero_tsih_s2().
1237	*/	1237	*/
1238	if (!login->leading_connection) {	1238	if (!login->leading_connection) {

drivers/target/iscsi/iscsi_target_nodeattrib.c+1−1

@@ -96,7 +96,7 @@ int iscsit_na_nopin_timeout( · 95 unmodified lines
96	u32 nopin_timeout)	96	u32 nopin_timeout)
97	{	97	{
98	struct iscsi_node_attrib *a = &acl->node_attrib;	98	struct iscsi_node_attrib *a = &acl->node_attrib;
99	struct iscsi_session *sess;	99	struct iscsit_session *sess;
100	struct iscsit_conn *conn;	100	struct iscsit_conn *conn;
101	struct se_node_acl *se_nacl = &a->nacl->se_node_acl;	101	struct se_node_acl *se_nacl = &a->nacl->se_node_acl;
102	struct se_session *se_sess;	102	struct se_session *se_sess;

drivers/target/iscsi/iscsi_target_seq_pdu_list.c+1−1

@@ -493,7 +493,7 @@ int iscsit_build_pdu_and_seq_lists( · 492 unmodified lines
493	struct iscsi_pdu *pdu = NULL;	493	struct iscsi_pdu *pdu = NULL;
494	struct iscsi_seq *seq = NULL;	494	struct iscsi_seq *seq = NULL;
495		495
496	struct iscsi_session *sess = conn->sess;	496	struct iscsit_session *sess = conn->sess;
497	struct iscsi_node_attrib *na;	497	struct iscsi_node_attrib *na;
498		498
499	/*	499	/*

drivers/target/iscsi/iscsi_target_stat.c+8−8

@@ -599,7 +599,7 @@ static ssize_t iscsi_stat_sess_node_show(struct config_item item, char page) · 598 unmodified lines
599	{	599	{
600	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	600	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
601	struct se_node_acl *se_nacl = &acl->se_node_acl;	601	struct se_node_acl *se_nacl = &acl->se_node_acl;
602	struct iscsi_session *sess;	602	struct iscsit_session *sess;
603	struct se_session *se_sess;	603	struct se_session *se_sess;
604	ssize_t ret = 0;	604	ssize_t ret = 0;
605		605
@@ -620,7 +620,7 @@ static ssize_t iscsi_stat_sess_indx_show(struct config_item item, char page) · 14 unmodified lines
620	{	620	{
621	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	621	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
622	struct se_node_acl *se_nacl = &acl->se_node_acl;	622	struct se_node_acl *se_nacl = &acl->se_node_acl;
623	struct iscsi_session *sess;	623	struct iscsit_session *sess;
624	struct se_session *se_sess;	624	struct se_session *se_sess;
625	ssize_t ret = 0;	625	ssize_t ret = 0;
626		626
@@ -642,7 +642,7 @@ static ssize_t iscsi_stat_sess_cmd_pdus_show(struct config_item *item, · 15 unmodified lines
642	{	642	{
643	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	643	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
644	struct se_node_acl *se_nacl = &acl->se_node_acl;	644	struct se_node_acl *se_nacl = &acl->se_node_acl;
645	struct iscsi_session *sess;	645	struct iscsit_session *sess;
646	struct se_session *se_sess;	646	struct se_session *se_sess;
647	ssize_t ret = 0;	647	ssize_t ret = 0;
648		648
@@ -664,7 +664,7 @@ static ssize_t iscsi_stat_sess_rsp_pdus_show(struct config_item *item, · 15 unmodified lines
664	{	664	{
665	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	665	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
666	struct se_node_acl *se_nacl = &acl->se_node_acl;	666	struct se_node_acl *se_nacl = &acl->se_node_acl;
667	struct iscsi_session *sess;	667	struct iscsit_session *sess;
668	struct se_session *se_sess;	668	struct se_session *se_sess;
669	ssize_t ret = 0;	669	ssize_t ret = 0;
670		670
@@ -686,7 +686,7 @@ static ssize_t iscsi_stat_sess_txdata_octs_show(struct config_item *item, · 15 unmodified lines
686	{	686	{
687	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	687	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
688	struct se_node_acl *se_nacl = &acl->se_node_acl;	688	struct se_node_acl *se_nacl = &acl->se_node_acl;
689	struct iscsi_session *sess;	689	struct iscsit_session *sess;
690	struct se_session *se_sess;	690	struct se_session *se_sess;
691	ssize_t ret = 0;	691	ssize_t ret = 0;
692		692
@@ -708,7 +708,7 @@ static ssize_t iscsi_stat_sess_rxdata_octs_show(struct config_item *item, · 15 unmodified lines
708	{	708	{
709	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	709	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
710	struct se_node_acl *se_nacl = &acl->se_node_acl;	710	struct se_node_acl *se_nacl = &acl->se_node_acl;
711	struct iscsi_session *sess;	711	struct iscsit_session *sess;
712	struct se_session *se_sess;	712	struct se_session *se_sess;
713	ssize_t ret = 0;	713	ssize_t ret = 0;
714		714
@@ -730,7 +730,7 @@ static ssize_t iscsi_stat_sess_conn_digest_errors_show(struct config_item *item, · 15 unmodified lines
730	{	730	{
731	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	731	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
732	struct se_node_acl *se_nacl = &acl->se_node_acl;	732	struct se_node_acl *se_nacl = &acl->se_node_acl;
733	struct iscsi_session *sess;	733	struct iscsit_session *sess;
734	struct se_session *se_sess;	734	struct se_session *se_sess;
735	ssize_t ret = 0;	735	ssize_t ret = 0;
736		736
@@ -752,7 +752,7 @@ static ssize_t iscsi_stat_sess_conn_timeout_errors_show( · 15 unmodified lines
752	{	752	{
753	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);	753	struct iscsi_node_acl *acl = iscsi_stat_nacl(item);
754	struct se_node_acl *se_nacl = &acl->se_node_acl;	754	struct se_node_acl *se_nacl = &acl->se_node_acl;
755	struct iscsi_session *sess;	755	struct iscsit_session *sess;
756	struct se_session *se_sess;	756	struct se_session *se_sess;
757	ssize_t ret = 0;	757	ssize_t ret = 0;
758		758

drivers/target/iscsi/iscsi_target_tmr.c+3−3

@@ -67,7 +67,7 @@ int iscsit_tmr_task_warm_reset( · 66 unmodified lines
67	struct iscsi_tmr_req *tmr_req,	67	struct iscsi_tmr_req *tmr_req,
68	unsigned char *buf)	68	unsigned char *buf)
69	{	69	{
70	struct iscsi_session *sess = conn->sess;	70	struct iscsit_session *sess = conn->sess;
71	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	71	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
72		72
73	if (!na->tmr_warm_reset) {	73	if (!na->tmr_warm_reset) {
@@ -87,7 +87,7 @@ int iscsit_tmr_task_cold_reset( · 13 unmodified lines
87	struct iscsi_tmr_req *tmr_req,	87	struct iscsi_tmr_req *tmr_req,
88	unsigned char *buf)	88	unsigned char *buf)
89	{	89	{
90	struct iscsi_session *sess = conn->sess;	90	struct iscsit_session *sess = conn->sess;
91	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	91	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
92		92
93	if (!na->tmr_cold_reset) {	93	if (!na->tmr_cold_reset) {
@@ -177,7 +177,7 @@ u8 iscsit_tmr_task_reassign( · 83 unmodified lines
177	static void iscsit_task_reassign_remove_cmd(	177	static void iscsit_task_reassign_remove_cmd(
178	struct iscsit_cmd *cmd,	178	struct iscsit_cmd *cmd,
179	struct iscsi_conn_recovery *cr,	179	struct iscsi_conn_recovery *cr,
180	struct iscsi_session *sess)	180	struct iscsit_session *sess)
181	{	181	{
182	int ret;	182	int ret;
183		183

drivers/target/iscsi/iscsi_target_tpg.c+1−1

@@ -390,7 +390,7 @@ int iscsit_tpg_disable_portal_group(struct iscsi_portal_group *tpg, int force) · 389 unmodified lines
390	}	390	}
391		391
392	struct iscsi_node_attrib *iscsit_tpg_get_node_attrib(	392	struct iscsi_node_attrib *iscsit_tpg_get_node_attrib(
393	struct iscsi_session *sess)	393	struct iscsit_session *sess)
394	{	394	{
395	struct se_session *se_sess = sess->se_sess;	395	struct se_session *se_sess = sess->se_sess;
396	struct se_node_acl *se_nacl = se_sess->se_node_acl;	396	struct se_node_acl *se_nacl = se_sess->se_node_acl;

drivers/target/iscsi/iscsi_target_tpg.h+2−2

@@ -5,7 +5,7 @@ · 4 unmodified lines
5	#include <linux/types.h>	5	#include <linux/types.h>
6		6
7	struct iscsi_np;	7	struct iscsi_np;
8	struct iscsi_session;	8	struct iscsit_session;
9	struct iscsi_tiqn;	9	struct iscsi_tiqn;
10	struct iscsi_tpg_np;	10	struct iscsi_tpg_np;
11	struct se_node_acl;	11	struct se_node_acl;
@@ -28,7 +28,7 @@ extern struct iscsi_node_acl *iscsit_tpg_add_initiator_node_acl( · 16 unmodified lines
28	struct iscsi_portal_group , const char , u32);	28	struct iscsi_portal_group , const char , u32);
29	extern void iscsit_tpg_del_initiator_node_acl(struct iscsi_portal_group *,	29	extern void iscsit_tpg_del_initiator_node_acl(struct iscsi_portal_group *,
30	struct se_node_acl *);	30	struct se_node_acl *);
31	extern struct iscsi_node_attrib iscsit_tpg_get_node_attrib(struct iscsi_session );	31	extern struct iscsi_node_attrib iscsit_tpg_get_node_attrib(struct iscsit_session );
32	extern void iscsit_tpg_del_external_nps(struct iscsi_tpg_np *);	32	extern void iscsit_tpg_del_external_nps(struct iscsi_tpg_np *);
33	extern struct iscsi_tpg_np iscsit_tpg_locate_child_np(struct iscsi_tpg_np , int);	33	extern struct iscsi_tpg_np iscsit_tpg_locate_child_np(struct iscsi_tpg_np , int);
34	extern struct iscsi_tpg_np iscsit_tpg_add_network_portal(struct iscsi_portal_group ,	34	extern struct iscsi_tpg_np iscsit_tpg_add_network_portal(struct iscsi_portal_group ,

drivers/target/iscsi/iscsi_target_util.c+14−14

@@ -238,7 +238,7 @@ struct iscsi_r2t *iscsit_get_holder_for_r2tsn( · 237 unmodified lines
238	return NULL;	238	return NULL;
239	}	239	}
240		240
241	static inline int iscsit_check_received_cmdsn(struct iscsi_session *sess, u32 cmdsn)	241	static inline int iscsit_check_received_cmdsn(struct iscsit_session *sess, u32 cmdsn)
242	{	242	{
243	u32 max_cmdsn;	243	u32 max_cmdsn;
244	int ret;	244	int ret;
@@ -446,7 +446,7 @@ struct iscsit_cmd *iscsit_find_cmd_from_ttt( · 201 unmodified lines
446	}	446	}
447		447
448	int iscsit_find_cmd_for_recovery(	448	int iscsit_find_cmd_for_recovery(
449	struct iscsi_session *sess,	449	struct iscsit_session *sess,
450	struct iscsit_cmd **cmd_ptr,	450	struct iscsit_cmd **cmd_ptr,
451	struct iscsi_conn_recovery **cr_ptr,	451	struct iscsi_conn_recovery **cr_ptr,
452	itt_t init_task_tag)	452	itt_t init_task_tag)
@@ -696,7 +696,7 @@ void iscsit_free_queue_reqs_for_conn(struct iscsit_conn *conn) · 243 unmodified lines
696		696
697	void iscsit_release_cmd(struct iscsit_cmd *cmd)	697	void iscsit_release_cmd(struct iscsit_cmd *cmd)
698	{	698	{
699	struct iscsi_session *sess;	699	struct iscsit_session *sess;
700	struct se_cmd *se_cmd = &cmd->se_cmd;	700	struct se_cmd *se_cmd = &cmd->se_cmd;
701		701
702	WARN_ON(!list_empty(&cmd->i_conn_node));	702	WARN_ON(!list_empty(&cmd->i_conn_node));
@@ -762,7 +762,7 @@ void iscsit_free_cmd(struct iscsit_cmd *cmd, bool shutdown) · 59 unmodified lines
762	}	762	}
763	EXPORT_SYMBOL(iscsit_free_cmd);	763	EXPORT_SYMBOL(iscsit_free_cmd);
764		764
765	bool iscsit_check_session_usage_count(struct iscsi_session *sess,	765	bool iscsit_check_session_usage_count(struct iscsit_session *sess,
766	bool can_sleep)	766	bool can_sleep)
767	{	767	{
768	spin_lock_bh(&sess->session_usage_lock);	768	spin_lock_bh(&sess->session_usage_lock);
@@ -780,7 +780,7 @@ bool iscsit_check_session_usage_count(struct iscsi_session *sess, · 11 unmodified lines
780	return false;	780	return false;
781	}	781	}
782		782
783	void iscsit_dec_session_usage_count(struct iscsi_session *sess)	783	void iscsit_dec_session_usage_count(struct iscsit_session *sess)
784	{	784	{
785	spin_lock_bh(&sess->session_usage_lock);	785	spin_lock_bh(&sess->session_usage_lock);
786	sess->session_usage_count--;	786	sess->session_usage_count--;
@@ -791,14 +791,14 @@ void iscsit_dec_session_usage_count(struct iscsi_session *sess) · 4 unmodified lines
791	spin_unlock_bh(&sess->session_usage_lock);	791	spin_unlock_bh(&sess->session_usage_lock);
792	}	792	}
793		793
794	void iscsit_inc_session_usage_count(struct iscsi_session *sess)	794	void iscsit_inc_session_usage_count(struct iscsit_session *sess)
795	{	795	{
796	spin_lock_bh(&sess->session_usage_lock);	796	spin_lock_bh(&sess->session_usage_lock);
797	sess->session_usage_count++;	797	sess->session_usage_count++;
798	spin_unlock_bh(&sess->session_usage_lock);	798	spin_unlock_bh(&sess->session_usage_lock);
799	}	799	}
800		800
801	struct iscsit_conn iscsit_get_conn_from_cid(struct iscsi_session sess, u16 cid)	801	struct iscsit_conn iscsit_get_conn_from_cid(struct iscsit_session sess, u16 cid)
802	{	802	{
803	struct iscsit_conn *conn;	803	struct iscsit_conn *conn;
804		804
@@ -816,7 +816,7 @@ struct iscsit_conn iscsit_get_conn_from_cid(struct iscsi_session sess, u16 cid · 11 unmodified lines
816	return NULL;	816	return NULL;
817	}	817	}
818		818
819	struct iscsit_conn iscsit_get_conn_from_cid_rcfr(struct iscsi_session sess, u16 cid)	819	struct iscsit_conn iscsit_get_conn_from_cid_rcfr(struct iscsit_session sess, u16 cid)
820	{	820	{
821	struct iscsit_conn *conn;	821	struct iscsit_conn *conn;
822		822
@@ -896,7 +896,7 @@ static int iscsit_add_nopin(struct iscsit_conn *conn, int want_response) · 73 unmodified lines
896	void iscsit_handle_nopin_response_timeout(struct timer_list *t)	896	void iscsit_handle_nopin_response_timeout(struct timer_list *t)
897	{	897	{
898	struct iscsit_conn *conn = from_timer(conn, t, nopin_response_timer);	898	struct iscsit_conn *conn = from_timer(conn, t, nopin_response_timer);
899	struct iscsi_session *sess = conn->sess;	899	struct iscsit_session *sess = conn->sess;
900		900
901	iscsit_inc_conn_usage_count(conn);	901	iscsit_inc_conn_usage_count(conn);
902		902
@@ -921,7 +921,7 @@ void iscsit_handle_nopin_response_timeout(struct timer_list *t) · 18 unmodified lines
921		921
922	void iscsit_mod_nopin_response_timer(struct iscsit_conn *conn)	922	void iscsit_mod_nopin_response_timer(struct iscsit_conn *conn)
923	{	923	{
924	struct iscsi_session *sess = conn->sess;	924	struct iscsit_session *sess = conn->sess;
925	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	925	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
926		926
927	spin_lock_bh(&conn->nopin_timer_lock);	927	spin_lock_bh(&conn->nopin_timer_lock);
@@ -937,7 +937,7 @@ void iscsit_mod_nopin_response_timer(struct iscsit_conn *conn) · 9 unmodified lines
937		937
938	void iscsit_start_nopin_response_timer(struct iscsit_conn *conn)	938	void iscsit_start_nopin_response_timer(struct iscsit_conn *conn)
939	{	939	{
940	struct iscsi_session *sess = conn->sess;	940	struct iscsit_session *sess = conn->sess;
941	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	941	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
942		942
943	spin_lock_bh(&conn->nopin_timer_lock);	943	spin_lock_bh(&conn->nopin_timer_lock);
@@ -994,7 +994,7 @@ void iscsit_handle_nopin_timeout(struct timer_list *t) · 50 unmodified lines
994		994
995	void __iscsit_start_nopin_timer(struct iscsit_conn *conn)	995	void __iscsit_start_nopin_timer(struct iscsit_conn *conn)
996	{	996	{
997	struct iscsi_session *sess = conn->sess;	997	struct iscsit_session *sess = conn->sess;
998	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);	998	struct iscsi_node_attrib *na = iscsit_tpg_get_node_attrib(sess);
999		999
1000	lockdep_assert_held(&conn->nopin_timer_lock);	1000	lockdep_assert_held(&conn->nopin_timer_lock);
@@ -1198,7 +1198,7 @@ int iscsit_tx_login_rsp(struct iscsit_conn *conn, u8 status_class, u8 status_det · 197 unmodified lines
1198	return conn->conn_transport->iscsit_put_login_tx(conn, login, 0);	1198	return conn->conn_transport->iscsit_put_login_tx(conn, login, 0);
1199	}	1199	}
1200		1200
1201	void iscsit_print_session_params(struct iscsi_session *sess)	1201	void iscsit_print_session_params(struct iscsit_session *sess)
1202	{	1202	{
1203	struct iscsit_conn *conn;	1203	struct iscsit_conn *conn;
1204		1204
@@ -1351,7 +1351,7 @@ struct iscsi_tiqn iscsit_snmp_get_tiqn(struct iscsit_conn conn) · 146 unmodified lines
1351	return tpg->tpg_tiqn;	1351	return tpg->tpg_tiqn;
1352	}	1352	}
1353		1353
1354	void iscsit_fill_cxn_timeout_err_stats(struct iscsi_session *sess)	1354	void iscsit_fill_cxn_timeout_err_stats(struct iscsit_session *sess)
1355	{	1355	{
1356	struct iscsi_portal_group *tpg = sess->tpg;	1356	struct iscsi_portal_group *tpg = sess->tpg;
1357	struct iscsi_tiqn *tiqn = tpg->tpg_tiqn;	1357	struct iscsi_tiqn *tiqn = tpg->tpg_tiqn;

drivers/target/iscsi/iscsi_target_util.h+9−9

include/target/iscsi/iscsi_target_core.h+5−5

@@ -482,7 +482,7 @@ struct iscsit_cmd { · 481 unmodified lines
482	/* Pointer to connection recovery entry */	482	/* Pointer to connection recovery entry */
483	struct iscsi_conn_recovery *cr;	483	struct iscsi_conn_recovery *cr;
484	/* Session the command is part of, used for connection recovery */	484	/* Session the command is part of, used for connection recovery */
485	struct iscsi_session *sess;	485	struct iscsit_session *sess;
486	/* list_head for connection list */	486	/* list_head for connection list */
487	struct list_head i_conn_node;	487	struct list_head i_conn_node;
488	/* The TCM I/O descriptor that is accessed via container_of() */	488	/* The TCM I/O descriptor that is accessed via container_of() */
@@ -598,7 +598,7 @@ struct iscsit_conn { · 109 unmodified lines
598	struct iscsi_portal_group *tpg;	598	struct iscsi_portal_group *tpg;
599	struct iscsi_tpg_np *tpg_np;	599	struct iscsi_tpg_np *tpg_np;
600	/* Pointer to parent session */	600	/* Pointer to parent session */
601	struct iscsi_session *sess;	601	struct iscsit_session *sess;
602	int bitmap_id;	602	int bitmap_id;
603	int rx_thread_active;	603	int rx_thread_active;
604	struct task_struct *rx_thread;	604	struct task_struct *rx_thread;
@@ -618,11 +618,11 @@ struct iscsi_conn_recovery { · 13 unmodified lines
618	struct list_head conn_recovery_cmd_list;	618	struct list_head conn_recovery_cmd_list;
619	spinlock_t conn_recovery_cmd_lock;	619	spinlock_t conn_recovery_cmd_lock;
620	struct timer_list time2retain_timer;	620	struct timer_list time2retain_timer;
621	struct iscsi_session *sess;	621	struct iscsit_session *sess;
622	struct list_head cr_list;	622	struct list_head cr_list;
623	} ____cacheline_aligned;	623	} ____cacheline_aligned;
624		624
625	struct iscsi_session {	625	struct iscsit_session {
626	u8 initiator_vendor;	626	u8 initiator_vendor;
627	u8 isid[6];	627	u8 isid[6];
628	enum iscsi_timer_flags_table time2retain_timer_flags;	628	enum iscsi_timer_flags_table time2retain_timer_flags;
@@ -885,7 +885,7 @@ struct iscsit_global { · 256 unmodified lines
885	struct iscsi_portal_group *discovery_tpg;	885	struct iscsi_portal_group *discovery_tpg;
886	};	886	};
887		887
888	static inline u32 session_get_next_ttt(struct iscsi_session *session)	888	static inline u32 session_get_next_ttt(struct iscsit_session *session)
889	{	889	{
890	u32 ttt;	890	u32 ttt;
891		891

include/target/iscsi/iscsi_transport.h+1−1

@@ -105,7 +105,7 @@ extern int iscsit_response_queue(struct iscsit_conn , struct iscsit_cmd , int) · 104 unmodified lines
105	/*	105	/*
106	* From iscsi_target_device.c	106	* From iscsi_target_device.c
107	*/	107	*/
108	extern void iscsit_increment_maxcmdsn(struct iscsit_cmd , struct iscsi_session );	108	extern void iscsit_increment_maxcmdsn(struct iscsit_cmd , struct iscsit_session );
109	/*	109	/*
110	* From iscsi_target_erl0.c	110	* From iscsi_target_erl0.c
111	*/	111	*/

@@ -743,7 +743,7 @@ int iscsit_check_post_dataout( · 742 unmodified lines
743		743
744	void iscsit_handle_time2retain_timeout(struct timer_list *t)	744	void iscsit_handle_time2retain_timeout(struct timer_list *t)
745	{	745	{
746	struct iscsi_session *sess = from_timer(sess, t, time2retain_timer);	746	struct iscsit_session *sess = from_timer(sess, t, time2retain_timer);
747	struct iscsi_portal_group *tpg = sess->tpg;	747	struct iscsi_portal_group *tpg = sess->tpg;
748	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	748	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
749		749
@@ -768,7 +768,7 @@ void iscsit_handle_time2retain_timeout(struct timer_list *t) · 18 unmodified lines
768	iscsit_close_session(sess, false);	768	iscsit_close_session(sess, false);
769	}	769	}
770		770
771	void iscsit_start_time2retain_handler(struct iscsi_session *sess)	771	void iscsit_start_time2retain_handler(struct iscsit_session *sess)
772	{	772	{
773	int tpg_active;	773	int tpg_active;
774	/*	774	/*
@@ -794,7 +794,7 @@ void iscsit_start_time2retain_handler(struct iscsi_session *sess) · 19 unmodified lines
794	jiffies + sess->sess_ops->DefaultTime2Retain * HZ);	794	jiffies + sess->sess_ops->DefaultTime2Retain * HZ);
795	}	795	}
796		796
797	int iscsit_stop_time2retain_timer(struct iscsi_session *sess)	797	int iscsit_stop_time2retain_timer(struct iscsit_session *sess)
798	{	798	{
799	struct iscsi_portal_group *tpg = sess->tpg;	799	struct iscsi_portal_group *tpg = sess->tpg;
800	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;	800	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;
@@ -880,7 +880,7 @@ void iscsit_cause_connection_reinstatement(struct iscsit_conn *conn, int sleep) · 79 unmodified lines
880	}	880	}
881	EXPORT_SYMBOL(iscsit_cause_connection_reinstatement);	881	EXPORT_SYMBOL(iscsit_cause_connection_reinstatement);
882		882
883	void iscsit_fall_back_to_erl0(struct iscsi_session *sess)	883	void iscsit_fall_back_to_erl0(struct iscsit_session *sess)
884	{	884	{
885	pr_debug("Falling back to ErrorRecoveryLevel=0 for SID:"	885	pr_debug("Falling back to ErrorRecoveryLevel=0 for SID:"
886	" %u\n", sess->sid);	886	" %u\n", sess->sid);
@@ -890,7 +890,7 @@ void iscsit_fall_back_to_erl0(struct iscsi_session *sess) · 3 unmodified lines
890		890
891	static void iscsit_handle_connection_cleanup(struct iscsit_conn *conn)	891	static void iscsit_handle_connection_cleanup(struct iscsit_conn *conn)
892	{	892	{
893	struct iscsi_session *sess = conn->sess;	893	struct iscsit_session *sess = conn->sess;
894		894
895	if ((sess->sess_ops->ErrorRecoveryLevel == 2) &&	895	if ((sess->sess_ops->ErrorRecoveryLevel == 2) &&
896	!atomic_read(&sess->session_reinstatement) &&	896	!atomic_read(&sess->session_reinstatement) &&

@@ -6,17 +6,17 @@ · 5 unmodified lines
6		6
7	struct iscsit_cmd;	7	struct iscsit_cmd;
8	struct iscsit_conn;	8	struct iscsit_conn;
9	struct iscsi_session;	9	struct iscsit_session;
10		10
11	extern void iscsit_set_dataout_sequence_values(struct iscsit_cmd *);	11	extern void iscsit_set_dataout_sequence_values(struct iscsit_cmd *);
12	extern int iscsit_check_pre_dataout(struct iscsit_cmd , unsigned char );	12	extern int iscsit_check_pre_dataout(struct iscsit_cmd , unsigned char );
13	extern int iscsit_check_post_dataout(struct iscsit_cmd , unsigned char , u8);	13	extern int iscsit_check_post_dataout(struct iscsit_cmd , unsigned char , u8);
14	extern void iscsit_start_time2retain_handler(struct iscsi_session *);	14	extern void iscsit_start_time2retain_handler(struct iscsit_session *);
15	extern void iscsit_handle_time2retain_timeout(struct timer_list *t);	15	extern void iscsit_handle_time2retain_timeout(struct timer_list *t);
16	extern int iscsit_stop_time2retain_timer(struct iscsi_session *);	16	extern int iscsit_stop_time2retain_timer(struct iscsit_session *);
17	extern void iscsit_connection_reinstatement_rcfr(struct iscsit_conn *);	17	extern void iscsit_connection_reinstatement_rcfr(struct iscsit_conn *);
18	extern void iscsit_cause_connection_reinstatement(struct iscsit_conn *, int);	18	extern void iscsit_cause_connection_reinstatement(struct iscsit_conn *, int);
19	extern void iscsit_fall_back_to_erl0(struct iscsi_session *);	19	extern void iscsit_fall_back_to_erl0(struct iscsit_session *);
20	extern void iscsit_take_action_for_connection_exit(struct iscsit_conn , bool );	20	extern void iscsit_take_action_for_connection_exit(struct iscsit_conn , bool );
21		21
22	#endif /* ISCSI_TARGET_ERL0_H */	22	#endif /* ISCSI_TARGET_ERL0_H */

@@ -10,7 +10,7 @@ struct iscsit_conn; · 9 unmodified lines
10	struct iscsi_datain_req;	10	struct iscsi_datain_req;
11	struct iscsi_ooo_cmdsn;	11	struct iscsi_ooo_cmdsn;
12	struct iscsi_pdu;	12	struct iscsi_pdu;
13	struct iscsi_session;	13	struct iscsit_session;
14		14
15	extern int iscsit_dump_data_payload(struct iscsit_conn *, u32, int);	15	extern int iscsit_dump_data_payload(struct iscsit_conn *, u32, int);
16	extern int iscsit_create_recovery_datain_values_datasequenceinorder_yes(	16	extern int iscsit_create_recovery_datain_values_datasequenceinorder_yes(
@@ -25,11 +25,11 @@ extern int iscsit_handle_data_ack(struct iscsit_conn *, u32, u32, u32); · 8 unmodified lines
25	extern int iscsit_dataout_datapduinorder_no_fbit(struct iscsit_cmd , struct iscsi_pdu );	25	extern int iscsit_dataout_datapduinorder_no_fbit(struct iscsit_cmd , struct iscsi_pdu );
26	extern int iscsit_recover_dataout_sequence(struct iscsit_cmd *, u32, u32);	26	extern int iscsit_recover_dataout_sequence(struct iscsit_cmd *, u32, u32);
27	extern void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *);	27	extern void iscsit_clear_ooo_cmdsns_for_conn(struct iscsit_conn *);
28	extern void iscsit_free_all_ooo_cmdsns(struct iscsi_session *);	28	extern void iscsit_free_all_ooo_cmdsns(struct iscsit_session *);
29	extern int iscsit_execute_ooo_cmdsns(struct iscsi_session *);	29	extern int iscsit_execute_ooo_cmdsns(struct iscsit_session *);
30	extern int iscsit_execute_cmd(struct iscsit_cmd *, int);	30	extern int iscsit_execute_cmd(struct iscsit_cmd *, int);
31	extern int iscsit_handle_ooo_cmdsn(struct iscsi_session , struct iscsit_cmd , u32);	31	extern int iscsit_handle_ooo_cmdsn(struct iscsit_session , struct iscsit_cmd , u32);
32	extern void iscsit_remove_ooo_cmdsn(struct iscsi_session , struct iscsi_ooo_cmdsn );	32	extern void iscsit_remove_ooo_cmdsn(struct iscsit_session , struct iscsi_ooo_cmdsn );
33	extern void iscsit_handle_dataout_timeout(struct timer_list *t);	33	extern void iscsit_handle_dataout_timeout(struct timer_list *t);
34	extern void iscsit_mod_dataout_timer(struct iscsit_cmd *);	34	extern void iscsit_mod_dataout_timer(struct iscsit_cmd *);
35	extern void iscsit_start_dataout_timer(struct iscsit_cmd , struct iscsit_conn );	35	extern void iscsit_start_dataout_timer(struct iscsit_cmd , struct iscsit_conn );

@@ -10,7 +10,7 @@ · 9 unmodified lines
10	struct iscsit_cmd;	10	struct iscsit_cmd;
11	struct iscsit_conn;	11	struct iscsit_conn;
12	struct iscsi_conn_recovery;	12	struct iscsi_conn_recovery;
13	struct iscsi_session;	13	struct iscsit_session;
14		14
15	extern int iscsit_add_r2t_to_list(struct iscsit_cmd *, u32, u32, int, u32);	15	extern int iscsit_add_r2t_to_list(struct iscsit_cmd *, u32, u32, int, u32);
16	extern struct iscsi_r2t iscsit_get_r2t_for_eos(struct iscsit_cmd , u32, u32);	16	extern struct iscsi_r2t iscsit_get_r2t_for_eos(struct iscsit_cmd , u32, u32);
@@ -28,7 +28,7 @@ extern int iscsit_check_unsolicited_dataout(struct iscsit_cmd , unsigned char · 11 unmodified lines
28	extern struct iscsit_cmd iscsit_find_cmd_from_itt_or_dump(struct iscsit_conn ,	28	extern struct iscsit_cmd iscsit_find_cmd_from_itt_or_dump(struct iscsit_conn ,
29	itt_t, u32);	29	itt_t, u32);
30	extern struct iscsit_cmd iscsit_find_cmd_from_ttt(struct iscsit_conn , u32);	30	extern struct iscsit_cmd iscsit_find_cmd_from_ttt(struct iscsit_conn , u32);
31	extern int iscsit_find_cmd_for_recovery(struct iscsi_session , struct iscsit_cmd *,	31	extern int iscsit_find_cmd_for_recovery(struct iscsit_session , struct iscsit_cmd *,
32	struct iscsi_conn_recovery **, itt_t);	32	struct iscsi_conn_recovery **, itt_t);
33	extern void iscsit_add_cmd_to_immediate_queue(struct iscsit_cmd , struct iscsit_conn , u8);	33	extern void iscsit_add_cmd_to_immediate_queue(struct iscsit_cmd , struct iscsit_conn , u8);
34	extern struct iscsi_queue_req iscsit_get_cmd_from_immediate_queue(struct iscsit_conn );	34	extern struct iscsi_queue_req iscsit_get_cmd_from_immediate_queue(struct iscsit_conn );
@@ -40,11 +40,11 @@ extern void iscsit_free_queue_reqs_for_conn(struct iscsit_conn *); · 5 unmodified lines
40	extern void iscsit_release_cmd(struct iscsit_cmd *);	40	extern void iscsit_release_cmd(struct iscsit_cmd *);
41	extern void __iscsit_free_cmd(struct iscsit_cmd *, bool);	41	extern void __iscsit_free_cmd(struct iscsit_cmd *, bool);
42	extern void iscsit_free_cmd(struct iscsit_cmd *, bool);	42	extern void iscsit_free_cmd(struct iscsit_cmd *, bool);
43	extern bool iscsit_check_session_usage_count(struct iscsi_session *sess, bool can_sleep);	43	extern bool iscsit_check_session_usage_count(struct iscsit_session *sess, bool can_sleep);
44	extern void iscsit_dec_session_usage_count(struct iscsi_session *);	44	extern void iscsit_dec_session_usage_count(struct iscsit_session *);
45	extern void iscsit_inc_session_usage_count(struct iscsi_session *);	45	extern void iscsit_inc_session_usage_count(struct iscsit_session *);
46	extern struct iscsit_conn iscsit_get_conn_from_cid(struct iscsi_session , u16);	46	extern struct iscsit_conn iscsit_get_conn_from_cid(struct iscsit_session , u16);
47	extern struct iscsit_conn iscsit_get_conn_from_cid_rcfr(struct iscsi_session , u16);	47	extern struct iscsit_conn iscsit_get_conn_from_cid_rcfr(struct iscsit_session , u16);
48	extern void iscsit_check_conn_usage_count(struct iscsit_conn *);	48	extern void iscsit_check_conn_usage_count(struct iscsit_conn *);
49	extern void iscsit_dec_conn_usage_count(struct iscsit_conn *);	49	extern void iscsit_dec_conn_usage_count(struct iscsit_conn *);
50	extern void iscsit_inc_conn_usage_count(struct iscsit_conn *);	50	extern void iscsit_inc_conn_usage_count(struct iscsit_conn *);
@@ -59,7 +59,7 @@ extern void iscsit_stop_nopin_timer(struct iscsit_conn *); · 8 unmodified lines
59	extern int iscsit_send_tx_data(struct iscsit_cmd , struct iscsit_conn , int);	59	extern int iscsit_send_tx_data(struct iscsit_cmd , struct iscsit_conn , int);
60	extern int iscsit_fe_sendpage_sg(struct iscsit_cmd , struct iscsit_conn );	60	extern int iscsit_fe_sendpage_sg(struct iscsit_cmd , struct iscsit_conn );
61	extern int iscsit_tx_login_rsp(struct iscsit_conn *, u8, u8);	61	extern int iscsit_tx_login_rsp(struct iscsit_conn *, u8, u8);
62	extern void iscsit_print_session_params(struct iscsi_session *);	62	extern void iscsit_print_session_params(struct iscsit_session *);
63	extern int iscsit_print_dev_to_proc(char , char *, off_t, int);	63	extern int iscsit_print_dev_to_proc(char , char *, off_t, int);
64	extern int iscsit_print_sessions_to_proc(char , char *, off_t, int);	64	extern int iscsit_print_sessions_to_proc(char , char *, off_t, int);
65	extern int iscsit_print_tpg_to_proc(char , char *, off_t, int);	65	extern int iscsit_print_tpg_to_proc(char , char *, off_t, int);
@@ -67,6 +67,6 @@ extern int rx_data(struct iscsit_conn , struct kvec , int, int); · 1 unmodified line
67	extern int tx_data(struct iscsit_conn , struct kvec , int, int);	67	extern int tx_data(struct iscsit_conn , struct kvec , int, int);
68	extern void iscsit_collect_login_stats(struct iscsit_conn *, u8, u8);	68	extern void iscsit_collect_login_stats(struct iscsit_conn *, u8, u8);
69	extern struct iscsi_tiqn iscsit_snmp_get_tiqn(struct iscsit_conn );	69	extern struct iscsi_tiqn iscsit_snmp_get_tiqn(struct iscsit_conn );
70	extern void iscsit_fill_cxn_timeout_err_stats(struct iscsi_session *);	70	extern void iscsit_fill_cxn_timeout_err_stats(struct iscsit_session *);
71		71
72	#endif /* ISCSI_TARGET_UTIL_H */	72	#endif /* ISCSI_TARGET_UTIL_H */