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

scsi: target: iscsi: Rename iscsi_conn to iscsit_conn 

The structure iscsi_conn naming is used by the iSCSI initiator
driver. Rename the target conn to iscsit_conn to have more readable code.

Link: https://lore.kernel.org/r/20220428092939.36768-2-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 66cd9d4e

drivers/infiniband/ulp/isert/ib_isert.c

+32 −32
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static struct workqueue_struct *isert_comp_wq; 
static struct workqueue_struct *isert_release_wq;



static int

isert_put_response(struct iscsi_conn *conn, struct iscsit_cmd *cmd);

isert_put_response(struct iscsit_conn *conn, struct iscsit_cmd *cmd);

static int

isert_login_post_recv(struct isert_conn *isert_conn);

static int
@@ -909,7 +909,7 @@ isert_login_post_recv(struct isert_conn *isert_conn) 
}



static int

isert_put_login_tx(struct iscsi_conn *conn, struct iscsi_login *login,

isert_put_login_tx(struct iscsit_conn *conn, struct iscsi_login *login,

		   u32 length)

{

	struct isert_conn *isert_conn = conn->context;
@@ -976,7 +976,7 @@ isert_rx_login_req(struct isert_conn *isert_conn) 
{

	struct iser_rx_desc *rx_desc = isert_conn->login_desc;

	int rx_buflen = isert_conn->login_req_len;

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	struct iscsi_login *login = conn->conn_login;

	int size;
@@ -1021,7 +1021,7 @@ isert_rx_login_req(struct isert_conn *isert_conn) 
}



static struct iscsit_cmd

*isert_allocate_cmd(struct iscsi_conn *conn, struct iser_rx_desc *rx_desc)

*isert_allocate_cmd(struct iscsit_conn *conn, struct iser_rx_desc *rx_desc)

{

	struct isert_conn *isert_conn = conn->context;

	struct isert_cmd *isert_cmd;
@@ -1045,7 +1045,7 @@ isert_handle_scsi_cmd(struct isert_conn *isert_conn, 
		      struct isert_cmd *isert_cmd, struct iscsit_cmd *cmd,

		      struct iser_rx_desc *rx_desc, unsigned char *buf)

{

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	struct iscsi_scsi_req *hdr = (struct iscsi_scsi_req *)buf;

	int imm_data, imm_data_len, unsol_data, sg_nents, rc;

	bool dump_payload = false;
@@ -1114,7 +1114,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn, 
			   struct iser_rx_desc *rx_desc, unsigned char *buf)

{

	struct scatterlist *sg_start;

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	struct iscsit_cmd *cmd = NULL;

	struct iscsi_data *hdr = (struct iscsi_data *)buf;

	u32 unsol_data_len = ntoh24(hdr->dlength);
@@ -1174,7 +1174,7 @@ isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, 
		     struct iscsit_cmd *cmd, struct iser_rx_desc *rx_desc,

		     unsigned char *buf)

{

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	struct iscsi_nopout *hdr = (struct iscsi_nopout *)buf;

	int rc;
@@ -1193,7 +1193,7 @@ isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd 
		      struct iscsit_cmd *cmd, struct iser_rx_desc *rx_desc,

		      struct iscsi_text *hdr)

{

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	u32 payload_length = ntoh24(hdr->dlength);

	int rc;

	unsigned char *text_in = NULL;
@@ -1220,7 +1220,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc, 
		uint32_t write_stag, uint64_t write_va)

{

	struct iscsi_hdr *hdr = isert_get_iscsi_hdr(rx_desc);

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	struct iscsit_cmd *cmd;

	struct isert_cmd *isert_cmd;

	int ret = -EINVAL;
@@ -1428,7 +1428,7 @@ isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err) 
{

	struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;

	struct isert_conn *isert_conn = isert_cmd->conn;

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;

	struct iscsi_text_rsp *hdr;



	isert_dbg("Cmd %p\n", isert_cmd);
@@ -1755,7 +1755,7 @@ isert_post_response(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd) 
}



static int

isert_put_response(struct iscsi_conn *conn, struct iscsit_cmd *cmd)

isert_put_response(struct iscsit_conn *conn, struct iscsit_cmd *cmd)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -1806,7 +1806,7 @@ isert_put_response(struct iscsi_conn *conn, struct iscsit_cmd *cmd) 
}



static void

isert_aborted_task(struct iscsi_conn *conn, struct iscsit_cmd *cmd)

isert_aborted_task(struct iscsit_conn *conn, struct iscsit_cmd *cmd)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -1822,7 +1822,7 @@ isert_aborted_task(struct iscsi_conn *conn, struct iscsit_cmd *cmd) 
}



static enum target_prot_op

isert_get_sup_prot_ops(struct iscsi_conn *conn)

isert_get_sup_prot_ops(struct iscsit_conn *conn)

{

	struct isert_conn *isert_conn = conn->context;

	struct isert_device *device = isert_conn->device;
@@ -1842,7 +1842,7 @@ isert_get_sup_prot_ops(struct iscsi_conn *conn) 
}



static int

isert_put_nopin(struct iscsit_cmd *cmd, struct iscsi_conn *conn,

isert_put_nopin(struct iscsit_cmd *cmd, struct iscsit_conn *conn,

		bool nopout_response)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
@@ -1862,7 +1862,7 @@ isert_put_nopin(struct iscsit_cmd *cmd, struct iscsi_conn *conn, 
}



static int

isert_put_logout_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn)

isert_put_logout_rsp(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -1880,7 +1880,7 @@ isert_put_logout_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn) 
}



static int

isert_put_tm_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn)

isert_put_tm_rsp(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -1898,7 +1898,7 @@ isert_put_tm_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn) 
}



static int

isert_put_reject(struct iscsit_cmd *cmd, struct iscsi_conn *conn)

isert_put_reject(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -1933,7 +1933,7 @@ isert_put_reject(struct iscsit_cmd *cmd, struct iscsi_conn *conn) 
}



static int

isert_put_text_rsp(struct iscsit_cmd *cmd, struct iscsi_conn *conn)

isert_put_text_rsp(struct iscsit_cmd *cmd, struct iscsit_conn *conn)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -2088,7 +2088,7 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, 
}



static int

isert_put_datain(struct iscsi_conn *conn, struct iscsit_cmd *cmd)

isert_put_datain(struct iscsit_conn *conn, struct iscsit_cmd *cmd)

{

	struct se_cmd *se_cmd = &cmd->se_cmd;

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);
@@ -2129,7 +2129,7 @@ isert_put_datain(struct iscsi_conn *conn, struct iscsit_cmd *cmd) 
}



static int

isert_get_dataout(struct iscsi_conn *conn, struct iscsit_cmd *cmd, bool recovery)

isert_get_dataout(struct iscsit_conn *conn, struct iscsit_cmd *cmd, bool recovery)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	int ret;
@@ -2147,7 +2147,7 @@ isert_get_dataout(struct iscsi_conn *conn, struct iscsit_cmd *cmd, bool recovery 
}



static int

isert_immediate_queue(struct iscsi_conn *conn, struct iscsit_cmd *cmd, int state)

isert_immediate_queue(struct iscsit_conn *conn, struct iscsit_cmd *cmd, int state)

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	int ret = 0;
@@ -2172,7 +2172,7 @@ isert_immediate_queue(struct iscsi_conn *conn, struct iscsit_cmd *cmd, int state 
}



static int

isert_response_queue(struct iscsi_conn *conn, struct iscsit_cmd *cmd, int state)

isert_response_queue(struct iscsit_conn *conn, struct iscsit_cmd *cmd, int state)

{

	struct isert_conn *isert_conn = conn->context;

	int ret;
@@ -2332,7 +2332,7 @@ isert_rdma_accept(struct isert_conn *isert_conn) 
}



static int

isert_get_login_rx(struct iscsi_conn *conn, struct iscsi_login *login)

isert_get_login_rx(struct iscsit_conn *conn, struct iscsi_login *login)

{

	struct isert_conn *isert_conn = conn->context;

	int ret;
@@ -2368,7 +2368,7 @@ isert_get_login_rx(struct iscsi_conn *conn, struct iscsi_login *login) 
}



static void

isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn,

isert_set_conn_info(struct iscsi_np *np, struct iscsit_conn *conn,

		    struct isert_conn *isert_conn)

{

	struct rdma_cm_id *cm_id = isert_conn->cm_id;
@@ -2381,7 +2381,7 @@ isert_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn, 
}



static int

isert_accept_np(struct iscsi_np *np, struct iscsi_conn *conn)

isert_accept_np(struct iscsi_np *np, struct iscsit_conn *conn)

{

	struct isert_np *isert_np = np->np_context;

	struct isert_conn *isert_conn;
@@ -2489,7 +2489,7 @@ static void isert_release_work(struct work_struct *work) 
static void

isert_wait4logout(struct isert_conn *isert_conn)

{

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsit_conn *conn = isert_conn->conn;



	isert_info("conn %p\n", isert_conn);
@@ -2501,9 +2501,9 @@ isert_wait4logout(struct isert_conn *isert_conn) 
}



static void

isert_wait4cmds(struct iscsi_conn *conn)

isert_wait4cmds(struct iscsit_conn *conn)

{

	isert_info("iscsi_conn %p\n", conn);

	isert_info("iscsit_conn %p\n", conn);



	if (conn->sess) {

		target_stop_session(conn->sess->se_sess);
@@ -2521,7 +2521,7 @@ isert_wait4cmds(struct iscsi_conn *conn) 
 * before blocking on the target_wait_for_session_cmds

 */

static void

isert_put_unsol_pending_cmds(struct iscsi_conn *conn)

isert_put_unsol_pending_cmds(struct iscsit_conn *conn)

{

	struct iscsit_cmd *cmd, *tmp;

	static LIST_HEAD(drop_cmd_list);
@@ -2546,7 +2546,7 @@ isert_put_unsol_pending_cmds(struct iscsi_conn *conn) 
	}

}



static void isert_wait_conn(struct iscsi_conn *conn)

static void isert_wait_conn(struct iscsit_conn *conn)

{

	struct isert_conn *isert_conn = conn->context;
@@ -2564,7 +2564,7 @@ static void isert_wait_conn(struct iscsi_conn *conn) 
	queue_work(isert_release_wq, &isert_conn->release_work);

}



static void isert_free_conn(struct iscsi_conn *conn)

static void isert_free_conn(struct iscsit_conn *conn)

{

	struct isert_conn *isert_conn = conn->context;
@@ -2572,7 +2572,7 @@ static void isert_free_conn(struct iscsi_conn *conn) 
	isert_put_conn(isert_conn);

}



static void isert_get_rx_pdu(struct iscsi_conn *conn)

static void isert_get_rx_pdu(struct iscsit_conn *conn)

{

	struct completion comp;

drivers/infiniband/ulp/isert/ib_isert.h

+1 −1
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ struct isert_conn { 
	u64			login_rsp_dma;

	struct iser_rx_desc	*rx_descs;

	struct ib_recv_wr	rx_wr[ISERT_QP_MAX_RECV_DTOS];

	struct iscsi_conn	*conn;

	struct iscsit_conn	*conn;

	struct list_head	node;

	struct completion	login_comp;

	struct completion	login_req_comp;

drivers/target/iscsi/cxgbit/cxgbit.h

+10 −10
Original line number Diff line number Diff line
@@ -189,7 +189,7 @@ struct cxgbit_np { 
struct cxgbit_sock {

	struct cxgbit_sock_common com;

	struct cxgbit_np *cnp;

	struct iscsi_conn *conn;

	struct iscsit_conn *conn;

	struct l2t_entry *l2t;

	struct dst_entry *dst;

	struct list_head list;
@@ -316,32 +316,32 @@ typedef void (*cxgbit_cplhandler_func)(struct cxgbit_device *, 


int cxgbit_setup_np(struct iscsi_np *, struct sockaddr_storage *);

int cxgbit_setup_conn_digest(struct cxgbit_sock *);

int cxgbit_accept_np(struct iscsi_np *, struct iscsi_conn *);

int cxgbit_accept_np(struct iscsi_np *, struct iscsit_conn *);

void cxgbit_free_np(struct iscsi_np *);

void cxgbit_abort_conn(struct cxgbit_sock *csk);

void cxgbit_free_conn(struct iscsi_conn *);

void cxgbit_free_conn(struct iscsit_conn *);

extern cxgbit_cplhandler_func cxgbit_cplhandlers[NUM_CPL_CMDS];

int cxgbit_get_login_rx(struct iscsi_conn *, struct iscsi_login *);

int cxgbit_get_login_rx(struct iscsit_conn *, struct iscsi_login *);

int cxgbit_rx_data_ack(struct cxgbit_sock *);

int cxgbit_l2t_send(struct cxgbit_device *, struct sk_buff *,

		    struct l2t_entry *);

void cxgbit_push_tx_frames(struct cxgbit_sock *);

int cxgbit_put_login_tx(struct iscsi_conn *, struct iscsi_login *, u32);

int cxgbit_xmit_pdu(struct iscsi_conn *, struct iscsit_cmd *,

int cxgbit_put_login_tx(struct iscsit_conn *, struct iscsi_login *, u32);

int cxgbit_xmit_pdu(struct iscsit_conn *, struct iscsit_cmd *,

		    struct iscsi_datain_req *, const void *, u32);

void cxgbit_get_r2t_ttt(struct iscsi_conn *, struct iscsit_cmd *,

void cxgbit_get_r2t_ttt(struct iscsit_conn *, struct iscsit_cmd *,

			struct iscsi_r2t *);

u32 cxgbit_send_tx_flowc_wr(struct cxgbit_sock *);

int cxgbit_ofld_send(struct cxgbit_device *, struct sk_buff *);

void cxgbit_get_rx_pdu(struct iscsi_conn *);

int cxgbit_validate_params(struct iscsi_conn *);

void cxgbit_get_rx_pdu(struct iscsit_conn *);

int cxgbit_validate_params(struct iscsit_conn *);

struct cxgbit_device *cxgbit_find_device(struct net_device *, u8 *);



/* DDP */

int cxgbit_ddp_init(struct cxgbit_device *);

int cxgbit_setup_conn_pgidx(struct cxgbit_sock *, u32);

int cxgbit_reserve_ttt(struct cxgbit_sock *, struct iscsit_cmd *);

void cxgbit_unmap_cmd(struct iscsi_conn *, struct iscsit_cmd *);

void cxgbit_unmap_cmd(struct iscsit_conn *, struct iscsit_cmd *);



static inline

struct cxgbi_ppm *cdev2ppm(struct cxgbit_device *cdev)

drivers/target/iscsi/cxgbit/cxgbit_cm.c

+4 −4
Original line number Diff line number Diff line
@@ -465,7 +465,7 @@ int cxgbit_setup_np(struct iscsi_np *np, struct sockaddr_storage *ksockaddr) 
}



static void

cxgbit_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn,

cxgbit_set_conn_info(struct iscsi_np *np, struct iscsit_conn *conn,

		     struct cxgbit_sock *csk)

{

	conn->login_family = np->np_sockaddr.ss_family;
@@ -473,7 +473,7 @@ cxgbit_set_conn_info(struct iscsi_np *np, struct iscsi_conn *conn, 
	conn->local_sockaddr = csk->com.local_addr;

}



int cxgbit_accept_np(struct iscsi_np *np, struct iscsi_conn *conn)

int cxgbit_accept_np(struct iscsi_np *np, struct iscsit_conn *conn)

{

	struct cxgbit_np *cnp = np->np_context;

	struct cxgbit_sock *csk;
@@ -717,7 +717,7 @@ void cxgbit_abort_conn(struct cxgbit_sock *csk) 


static void __cxgbit_free_conn(struct cxgbit_sock *csk)

{

	struct iscsi_conn *conn = csk->conn;

	struct iscsit_conn *conn = csk->conn;

	bool release = false;



	pr_debug("%s: state %d\n",
@@ -751,7 +751,7 @@ static void __cxgbit_free_conn(struct cxgbit_sock *csk) 
		cxgbit_put_csk(csk);

}



void cxgbit_free_conn(struct iscsi_conn *conn)

void cxgbit_free_conn(struct iscsit_conn *conn)

{

	__cxgbit_free_conn(conn->context);

}

drivers/target/iscsi/cxgbit/cxgbit_ddp.c

+2 −2
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ cxgbit_ddp_reserve(struct cxgbit_sock *csk, struct cxgbi_task_tag_info *ttinfo, 
}



void

cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsit_cmd *cmd,

cxgbit_get_r2t_ttt(struct iscsit_conn *conn, struct iscsit_cmd *cmd,

		   struct iscsi_r2t *r2t)

{

	struct cxgbit_sock *csk = conn->context;
@@ -260,7 +260,7 @@ cxgbit_get_r2t_ttt(struct iscsi_conn *conn, struct iscsit_cmd *cmd, 
	r2t->targ_xfer_tag = ttinfo->tag;

}



void cxgbit_unmap_cmd(struct iscsi_conn *conn, struct iscsit_cmd *cmd)

void cxgbit_unmap_cmd(struct iscsit_conn *conn, struct iscsit_cmd *cmd)

{

	struct cxgbit_cmd *ccmd = iscsit_priv_cmd(cmd);