Commit 0873fe44 authored by Max Gurtovoy's avatar Max Gurtovoy Committed by Martin K. Petersen
Browse files

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.

Link: https://lore.kernel.org/r/20220428092939.36768-3-mgurtovoy@nvidia.com


Reviewed-by: default avatarMike Christie <michael.christie@oracle.com>
Signed-off-by: default avatarMax Gurtovoy <mgurtovoy@nvidia.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent be36d683

drivers/target/iscsi/iscsi_target.c

+14 −14
Original line number Diff line number Diff line
@@ -2350,7 +2350,7 @@ iscsit_handle_text_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd, 
int iscsit_logout_closesession(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct iscsit_conn *conn_p;

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;



	pr_debug("Received logout request CLOSESESSION on CID: %hu"

		" 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) 
int iscsit_logout_closeconnection(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct iscsit_conn *l_conn;

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;



	pr_debug("Received logout request CLOSECONNECTION for CID:"

		" %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 


int iscsit_logout_removeconnforrecovery(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;



	pr_debug("Received explicit REMOVECONNFORRECOVERY logout for"

		" 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, 
{

	struct iscsit_conn *logout_conn = NULL;

	struct iscsi_conn_recovery *cr = NULL;

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;

	/*

	 * The actual shutting down of Sessions and/or Connections

	 * for CLOSESESSION and CLOSECONNECTION Logout Requests
@@ -4145,7 +4145,7 @@ static void iscsit_release_commands_from_conn(struct iscsit_conn *conn) 
{

	LIST_HEAD(tmp_list);

	struct iscsit_cmd *cmd = NULL, *cmd_tmp = NULL;

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;

	/*

	 * We expect this function to only ever be called from either RX or TX

	 * thread context via iscsit_close_connection() once the other context
@@ -4201,7 +4201,7 @@ int iscsit_close_connection( 
	struct iscsit_conn *conn)

{

	int conn_logout = (conn->conn_state == TARG_CONN_STATE_IN_LOGOUT);

	struct iscsi_session	*sess = conn->sess;

	struct iscsit_session	*sess = conn->sess;



	pr_debug("Closing iSCSI connection CID %hu on SID:"

		" %u\n", conn->cid, sess->sid);
@@ -4438,7 +4438,7 @@ int iscsit_close_connection( 
 * If the iSCSI Session for the iSCSI Initiator Node exists,

 * forcefully shutdown the iSCSI NEXUS.

 */

int iscsit_close_session(struct iscsi_session *sess, bool can_sleep)

int iscsit_close_session(struct iscsit_session *sess, bool can_sleep)

{

	struct iscsi_portal_group *tpg = sess->tpg;

	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) 
static void iscsit_logout_post_handler_closesession(

	struct iscsit_conn *conn)

{

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;

	int sleep = 1;

	/*

	 * Traditional iscsi/tcp will invoke this logic from TX thread
@@ -4557,7 +4557,7 @@ static void iscsit_logout_post_handler_diffcid( 
	u16 cid)

{

	struct iscsit_conn *l_conn;

	struct iscsi_session *sess = conn->sess;

	struct iscsit_session *sess = conn->sess;

	bool conn_found = false;



	if (!sess)
@@ -4649,7 +4649,7 @@ int iscsit_logout_post_handler( 
}

EXPORT_SYMBOL(iscsit_logout_post_handler);



void iscsit_fail_session(struct iscsi_session *sess)

void iscsit_fail_session(struct iscsit_session *sess)

{

	struct iscsit_conn *conn;
@@ -4665,7 +4665,7 @@ void iscsit_fail_session(struct iscsi_session *sess) 
}



void iscsit_stop_session(

	struct iscsi_session *sess,

	struct iscsit_session *sess,

	int session_sleep,

	int connection_sleep)

{
@@ -4712,7 +4712,7 @@ void iscsit_stop_session( 


int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force)

{

	struct iscsi_session *sess;

	struct iscsit_session *sess;

	struct se_portal_group *se_tpg = &tpg->tpg_se_tpg;

	struct se_session *se_sess, *se_sess_tmp;

	LIST_HEAD(free_list);
@@ -4726,7 +4726,7 @@ int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *tpg, int force) 


	list_for_each_entry_safe(se_sess, se_sess_tmp, &se_tpg->tpg_sess_list,

			sess_list) {

		sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;

		sess = (struct iscsit_session *)se_sess->fabric_sess_ptr;



		spin_lock(&sess->conn_lock);

		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) 
	spin_unlock_bh(&se_tpg->session_lock);



	list_for_each_entry_safe(se_sess, se_sess_tmp, &free_list, sess_list) {

		sess = (struct iscsi_session *)se_sess->fabric_sess_ptr;

		sess = (struct iscsit_session *)se_sess->fabric_sess_ptr;



		list_del_init(&se_sess->sess_list);

		iscsit_stop_session(sess, 1, 1);

drivers/target/iscsi/iscsi_target.h

+4 −4
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ struct iscsit_cmd; 
struct iscsit_conn;

struct iscsi_np;

struct iscsi_portal_group;

struct iscsi_session;

struct iscsit_session;

struct iscsi_tpg_np;

struct kref;

struct sockaddr_storage;
@@ -41,9 +41,9 @@ extern void iscsit_thread_get_cpumask(struct iscsit_conn *); 
extern int iscsi_target_tx_thread(void *);

extern int iscsi_target_rx_thread(void *);

extern int iscsit_close_connection(struct iscsit_conn *);

extern int iscsit_close_session(struct iscsi_session *, bool can_sleep);

extern void iscsit_fail_session(struct iscsi_session *);

extern void iscsit_stop_session(struct iscsi_session *, int, int);

extern int iscsit_close_session(struct iscsit_session *, bool can_sleep);

extern void iscsit_fail_session(struct iscsit_session *);

extern void iscsit_stop_session(struct iscsit_session *, int, int);

extern int iscsit_release_sessions_for_tpg(struct iscsi_portal_group *, int);



extern struct iscsit_global *iscsit_global;

drivers/target/iscsi/iscsi_target_configfs.c

+6 −6
Original line number Diff line number Diff line
@@ -443,7 +443,7 @@ static ssize_t iscsi_nacl_param_##name##_show(struct config_item *item, \ 
		char *page)						\

{									\

	struct se_node_acl *se_nacl = param_to_nacl(item);		\

	struct iscsi_session *sess;					\

	struct iscsit_session *sess;					\

	struct se_session *se_sess;					\

	ssize_t rb;							\

									\
@@ -498,7 +498,7 @@ static struct configfs_attribute *lio_target_nacl_param_attrs[] = { 
static ssize_t lio_target_nacl_info_show(struct config_item *item, char *page)

{

	struct se_node_acl *se_nacl = acl_to_nacl(item);

	struct iscsi_session *sess;

	struct iscsit_session *sess;

	struct iscsit_conn *conn;

	struct se_session *se_sess;

	ssize_t rb = 0;
@@ -1347,7 +1347,7 @@ static int iscsi_get_cmd_state(struct se_cmd *se_cmd) 


static u32 lio_sess_get_index(struct se_session *se_sess)

{

	struct iscsi_session *sess = se_sess->fabric_sess_ptr;

	struct iscsit_session *sess = se_sess->fabric_sess_ptr;



	return sess->session_index;

}
@@ -1357,7 +1357,7 @@ static u32 lio_sess_get_initiator_sid( 
	unsigned char *buf,

	u32 size)

{

	struct iscsi_session *sess = se_sess->fabric_sess_ptr;

	struct iscsit_session *sess = se_sess->fabric_sess_ptr;

	/*

	 * iSCSI Initiator Session Identifier from RFC-3720.

	 */
@@ -1468,11 +1468,11 @@ static int lio_tpg_check_prot_fabric_only( 


/*

 * This function calls iscsit_inc_session_usage_count() on the

 * struct iscsi_session in question.

 * struct iscsit_session in question.

 */

static void lio_tpg_close_session(struct se_session *se_sess)

{

	struct iscsi_session *sess = se_sess->fabric_sess_ptr;

	struct iscsit_session *sess = se_sess->fabric_sess_ptr;

	struct se_portal_group *se_tpg = &sess->tpg->tpg_se_tpg;



	spin_lock_bh(&se_tpg->session_lock);

drivers/target/iscsi/iscsi_target_device.c

+2 −2
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ 
#include "iscsi_target_tpg.h"

#include "iscsi_target_util.h"



void iscsit_determine_maxcmdsn(struct iscsi_session *sess)

void iscsit_determine_maxcmdsn(struct iscsit_session *sess)

{

	struct se_node_acl *se_nacl;
@@ -42,7 +42,7 @@ void iscsit_determine_maxcmdsn(struct iscsi_session *sess) 
	atomic_add(se_nacl->queue_depth - 1, &sess->max_cmd_sn);

}



void iscsit_increment_maxcmdsn(struct iscsit_cmd *cmd, struct iscsi_session *sess)

void iscsit_increment_maxcmdsn(struct iscsit_cmd *cmd, struct iscsit_session *sess)

{

	u32 max_cmd_sn;

drivers/target/iscsi/iscsi_target_device.h

+3 −3
Original line number Diff line number Diff line
@@ -3,9 +3,9 @@ 
#define ISCSI_TARGET_DEVICE_H



struct iscsit_cmd;

struct iscsi_session;

struct iscsit_session;



extern void iscsit_determine_maxcmdsn(struct iscsi_session *);

extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsi_session *);

extern void iscsit_determine_maxcmdsn(struct iscsit_session *);

extern void iscsit_increment_maxcmdsn(struct iscsit_cmd *, struct iscsit_session *);



#endif /* ISCSI_TARGET_DEVICE_H */