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

scsi: target: iscsi: Rename iscsi_cmd to iscsit_cmd 

The structure iscsi_cmd naming is used by the iSCSI initiator driver.
Rename the target cmd to iscsit_cmd to have more readable code.

Link: https://lore.kernel.org/r/20220428092939.36768-1-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 256bd4f2

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 iscsi_cmd *cmd);

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

static int

isert_login_post_recv(struct isert_conn *isert_conn);

static int
@@ -1020,21 +1020,21 @@ isert_rx_login_req(struct isert_conn *isert_conn) 
	schedule_delayed_work(&conn->login_work, 0);

}



static struct iscsi_cmd

static struct iscsit_cmd

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

{

	struct isert_conn *isert_conn = conn->context;

	struct isert_cmd *isert_cmd;

	struct iscsi_cmd *cmd;

	struct iscsit_cmd *cmd;



	cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE);

	if (!cmd) {

		isert_err("Unable to allocate iscsi_cmd + isert_cmd\n");

		isert_err("Unable to allocate iscsit_cmd + isert_cmd\n");

		return NULL;

	}

	isert_cmd = iscsit_priv_cmd(cmd);

	isert_cmd->conn = isert_conn;

	isert_cmd->iscsi_cmd = cmd;

	isert_cmd->iscsit_cmd = cmd;

	isert_cmd->rx_desc = rx_desc;



	return cmd;
@@ -1042,7 +1042,7 @@ static struct iscsi_cmd 


static int

isert_handle_scsi_cmd(struct isert_conn *isert_conn,

		      struct isert_cmd *isert_cmd, struct iscsi_cmd *cmd,

		      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;
@@ -1115,7 +1115,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn, 
{

	struct scatterlist *sg_start;

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsi_cmd *cmd = NULL;

	struct iscsit_cmd *cmd = NULL;

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

	u32 unsol_data_len = ntoh24(hdr->dlength);

	int rc, sg_nents, sg_off, page_off;
@@ -1171,7 +1171,7 @@ isert_handle_iscsi_dataout(struct isert_conn *isert_conn, 


static int

isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,

		     struct iscsi_cmd *cmd, struct iser_rx_desc *rx_desc,

		     struct iscsit_cmd *cmd, struct iser_rx_desc *rx_desc,

		     unsigned char *buf)

{

	struct iscsi_conn *conn = isert_conn->conn;
@@ -1190,7 +1190,7 @@ isert_handle_nop_out(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd, 


static int

isert_handle_text_cmd(struct isert_conn *isert_conn, struct isert_cmd *isert_cmd,

		      struct iscsi_cmd *cmd, struct iser_rx_desc *rx_desc,

		      struct iscsit_cmd *cmd, struct iser_rx_desc *rx_desc,

		      struct iscsi_text *hdr)

{

	struct iscsi_conn *conn = isert_conn->conn;
@@ -1221,7 +1221,7 @@ isert_rx_opcode(struct isert_conn *isert_conn, struct iser_rx_desc *rx_desc, 
{

	struct iscsi_hdr *hdr = isert_get_iscsi_hdr(rx_desc);

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsi_cmd *cmd;

	struct iscsit_cmd *cmd;

	struct isert_cmd *isert_cmd;

	int ret = -EINVAL;

	u8 opcode = (hdr->opcode & ISCSI_OPCODE_MASK);
@@ -1404,7 +1404,7 @@ isert_login_recv_done(struct ib_cq *cq, struct ib_wc *wc) 
static void

isert_rdma_rw_ctx_destroy(struct isert_cmd *cmd, struct isert_conn *conn)

{

	struct se_cmd *se_cmd = &cmd->iscsi_cmd->se_cmd;

	struct se_cmd *se_cmd = &cmd->iscsit_cmd->se_cmd;

	enum dma_data_direction dir = target_reverse_dma_direction(se_cmd);



	if (!cmd->rw.nr_ops)
@@ -1426,7 +1426,7 @@ isert_rdma_rw_ctx_destroy(struct isert_cmd *cmd, struct isert_conn *conn) 
static void

isert_put_cmd(struct isert_cmd *isert_cmd, bool comp_err)

{

	struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;

	struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;

	struct isert_conn *isert_conn = isert_cmd->conn;

	struct iscsi_conn *conn = isert_conn->conn;

	struct iscsi_text_rsp *hdr;
@@ -1575,7 +1575,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc) 
	struct isert_device *device = isert_conn->device;

	struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe);

	struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc);

	struct se_cmd *cmd = &isert_cmd->iscsi_cmd->se_cmd;

	struct se_cmd *cmd = &isert_cmd->iscsit_cmd->se_cmd;

	int ret = 0;



	if (unlikely(wc->status != IB_WC_SUCCESS)) {
@@ -1604,7 +1604,7 @@ isert_rdma_write_done(struct ib_cq *cq, struct ib_wc *wc) 
		/*

		 * XXX: isert_put_response() failure is not retried.

		 */

		ret = isert_put_response(isert_conn->conn, isert_cmd->iscsi_cmd);

		ret = isert_put_response(isert_conn->conn, isert_cmd->iscsit_cmd);

		if (ret)

			pr_warn_ratelimited("isert_put_response() ret: %d\n", ret);

	}
@@ -1617,7 +1617,7 @@ isert_rdma_read_done(struct ib_cq *cq, struct ib_wc *wc) 
	struct isert_device *device = isert_conn->device;

	struct iser_tx_desc *desc = cqe_to_tx_desc(wc->wr_cqe);

	struct isert_cmd *isert_cmd = tx_desc_to_cmd(desc);

	struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;

	struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;

	struct se_cmd *se_cmd = &cmd->se_cmd;

	int ret = 0;
@@ -1662,7 +1662,7 @@ isert_do_control_comp(struct work_struct *work) 
			struct isert_cmd, comp_work);

	struct isert_conn *isert_conn = isert_cmd->conn;

	struct ib_device *ib_dev = isert_conn->cm_id->device;

	struct iscsi_cmd *cmd = isert_cmd->iscsi_cmd;

	struct iscsit_cmd *cmd = isert_cmd->iscsit_cmd;



	isert_dbg("Cmd %p i_state %d\n", isert_cmd, cmd->i_state);
@@ -1720,7 +1720,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc) 


	isert_dbg("Cmd %p\n", isert_cmd);



	switch (isert_cmd->iscsi_cmd->i_state) {

	switch (isert_cmd->iscsit_cmd->i_state) {

	case ISTATE_SEND_TASKMGTRSP:

	case ISTATE_SEND_LOGOUTRSP:

	case ISTATE_SEND_REJECT:
@@ -1731,7 +1731,7 @@ isert_send_done(struct ib_cq *cq, struct ib_wc *wc) 
		queue_work(isert_comp_wq, &isert_cmd->comp_work);

		return;

	default:

		isert_cmd->iscsi_cmd->i_state = ISTATE_SENT_STATUS;

		isert_cmd->iscsit_cmd->i_state = ISTATE_SENT_STATUS;

		isert_completion_put(tx_desc, isert_cmd, ib_dev, false);

		break;

	}
@@ -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 iscsi_cmd *cmd)

isert_put_response(struct iscsi_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 iscsi_cmd *cmd) 
}



static void

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

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

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

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



static int

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

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

		bool nopout_response)

{

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



static int

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

isert_put_logout_rsp(struct iscsit_cmd *cmd, struct iscsi_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 iscsi_cmd *cmd, struct iscsi_conn *conn) 
}



static int

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

isert_put_tm_rsp(struct iscsit_cmd *cmd, struct iscsi_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 iscsi_cmd *cmd, struct iscsi_conn *conn) 
}



static int

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

isert_put_reject(struct iscsit_cmd *cmd, struct iscsi_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 iscsi_cmd *cmd, struct iscsi_conn *conn) 
}



static int

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

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

{

	struct isert_cmd *isert_cmd = iscsit_priv_cmd(cmd);

	struct isert_conn *isert_conn = conn->context;
@@ -2035,7 +2035,7 @@ static int 
isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn,

		struct ib_cqe *cqe, struct ib_send_wr *chain_wr)

{

	struct se_cmd *se_cmd = &cmd->iscsi_cmd->se_cmd;

	struct se_cmd *se_cmd = &cmd->iscsit_cmd->se_cmd;

	enum dma_data_direction dir = target_reverse_dma_direction(se_cmd);

	u8 port_num = conn->cm_id->port_num;

	u64 addr;
@@ -2048,7 +2048,7 @@ isert_rdma_rw_ctx_post(struct isert_cmd *cmd, struct isert_conn *conn, 
	if (dir == DMA_FROM_DEVICE) {

		addr = cmd->write_va;

		rkey = cmd->write_stag;

		offset = cmd->iscsi_cmd->write_data_done;

		offset = cmd->iscsit_cmd->write_data_done;

	} else {

		addr = cmd->read_va;

		rkey = cmd->read_stag;
@@ -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 iscsi_cmd *cmd)

isert_put_datain(struct iscsi_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 iscsi_cmd *cmd) 
}



static int

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

isert_get_dataout(struct iscsi_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 iscsi_cmd *cmd, bool recovery) 
}



static int

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

isert_immediate_queue(struct iscsi_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 iscsi_cmd *cmd, int state) 
}



static int

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

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

{

	struct isert_conn *isert_conn = conn->context;

	int ret;
@@ -2523,7 +2523,7 @@ isert_wait4cmds(struct iscsi_conn *conn) 
static void

isert_put_unsol_pending_cmds(struct iscsi_conn *conn)

{

	struct iscsi_cmd *cmd, *tmp;

	struct iscsit_cmd *cmd, *tmp;

	static LIST_HEAD(drop_cmd_list);



	spin_lock_bh(&conn->cmd_lock);

drivers/infiniband/ulp/isert/ib_isert.h

+1 −1
Original line number Diff line number Diff line
@@ -146,7 +146,7 @@ struct isert_cmd { 
	u64			pdu_buf_dma;

	u32			pdu_buf_len;

	struct isert_conn	*conn;

	struct iscsi_cmd	*iscsi_cmd;

	struct iscsit_cmd	*iscsit_cmd;

	struct iser_tx_desc	tx_desc;

	struct iser_rx_desc	*rx_desc;

	struct rdma_rw_ctx	rw;

drivers/target/iscsi/cxgbit/cxgbit.h

+4 −4
Original line number Diff line number Diff line
@@ -327,9 +327,9 @@ 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 iscsi_cmd *,

int cxgbit_xmit_pdu(struct iscsi_conn *, struct iscsit_cmd *,

		    struct iscsi_datain_req *, const void *, u32);

void cxgbit_get_r2t_ttt(struct iscsi_conn *, struct iscsi_cmd *,

void cxgbit_get_r2t_ttt(struct iscsi_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 *);
@@ -340,8 +340,8 @@ 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 iscsi_cmd *);

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

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

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



static inline

struct cxgbi_ppm *cdev2ppm(struct cxgbit_device *cdev)

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 iscsi_cmd *cmd,

cxgbit_get_r2t_ttt(struct iscsi_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 iscsi_cmd *cmd, 
	r2t->targ_xfer_tag = ttinfo->tag;

}



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

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

{

	struct cxgbit_cmd *ccmd = iscsit_priv_cmd(cmd);

drivers/target/iscsi/cxgbit/cxgbit_target.c

+17 −17
Original line number Diff line number Diff line
@@ -337,7 +337,7 @@ static int cxgbit_queue_skb(struct cxgbit_sock *csk, struct sk_buff *skb) 
}



static int

cxgbit_map_skb(struct iscsi_cmd *cmd, struct sk_buff *skb, u32 data_offset,

cxgbit_map_skb(struct iscsit_cmd *cmd, struct sk_buff *skb, u32 data_offset,

	       u32 data_length)

{

	u32 i = 0, nr_frags = MAX_SKB_FRAGS;
@@ -390,7 +390,7 @@ cxgbit_map_skb(struct iscsi_cmd *cmd, struct sk_buff *skb, u32 data_offset, 
}



static int

cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsi_cmd *cmd,

cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsit_cmd *cmd,

		     struct iscsi_datain_req *dr)

{

	struct iscsi_conn *conn = csk->conn;
@@ -481,7 +481,7 @@ cxgbit_tx_datain_iso(struct cxgbit_sock *csk, struct iscsi_cmd *cmd, 
}



static int

cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsi_cmd *cmd,

cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsit_cmd *cmd,

		 const struct iscsi_datain *datain)

{

	struct sk_buff *skb;
@@ -510,7 +510,7 @@ cxgbit_tx_datain(struct cxgbit_sock *csk, struct iscsi_cmd *cmd, 
}



static int

cxgbit_xmit_datain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd,

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

		       struct iscsi_datain_req *dr,

		       const struct iscsi_datain *datain)

{
@@ -530,7 +530,7 @@ cxgbit_xmit_datain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
}



static int

cxgbit_xmit_nondatain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd,

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

			  const void *data_buf, u32 data_buf_len)

{

	struct cxgbit_sock *csk = conn->context;
@@ -560,7 +560,7 @@ cxgbit_xmit_nondatain_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd, 
}



int

cxgbit_xmit_pdu(struct iscsi_conn *conn, struct iscsi_cmd *cmd,

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

		struct iscsi_datain_req *dr, const void *buf, u32 buf_len)

{

	if (dr)
@@ -832,16 +832,16 @@ cxgbit_skb_copy_to_sg(struct sk_buff *skb, struct scatterlist *sg, 
	}

}



static struct iscsi_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk)

static struct iscsit_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk)

{

	struct iscsi_conn *conn = csk->conn;

	struct cxgbi_ppm *ppm = cdev2ppm(csk->com.cdev);

	struct cxgbit_cmd *ccmd;

	struct iscsi_cmd *cmd;

	struct iscsit_cmd *cmd;



	cmd = iscsit_allocate_cmd(conn, TASK_INTERRUPTIBLE);

	if (!cmd) {

		pr_err("Unable to allocate iscsi_cmd + cxgbit_cmd\n");

		pr_err("Unable to allocate iscsit_cmd + cxgbit_cmd\n");

		return NULL;

	}
@@ -853,7 +853,7 @@ static struct iscsi_cmd *cxgbit_allocate_cmd(struct cxgbit_sock *csk) 
}



static int

cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,

cxgbit_handle_immediate_data(struct iscsit_cmd *cmd, struct iscsi_scsi_req *hdr,

			     u32 length)

{

	struct iscsi_conn *conn = cmd->conn;
@@ -910,7 +910,7 @@ cxgbit_handle_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, 
}



static int

cxgbit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr,

cxgbit_get_immediate_data(struct iscsit_cmd *cmd, struct iscsi_scsi_req *hdr,

			  bool dump_payload)

{

	struct iscsi_conn *conn = cmd->conn;
@@ -964,7 +964,7 @@ cxgbit_get_immediate_data(struct iscsi_cmd *cmd, struct iscsi_scsi_req *hdr, 
}



static int

cxgbit_handle_scsi_cmd(struct cxgbit_sock *csk, struct iscsi_cmd *cmd)

cxgbit_handle_scsi_cmd(struct cxgbit_sock *csk, struct iscsit_cmd *cmd)

{

	struct iscsi_conn *conn = csk->conn;

	struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
@@ -996,7 +996,7 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk) 
{

	struct scatterlist *sg_start;

	struct iscsi_conn *conn = csk->conn;

	struct iscsi_cmd *cmd = NULL;

	struct iscsit_cmd *cmd = NULL;

	struct cxgbit_cmd *ccmd;

	struct cxgbi_task_tag_info *ttinfo;

	struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
@@ -1084,7 +1084,7 @@ static int cxgbit_handle_iscsi_dataout(struct cxgbit_sock *csk) 
	return 0;

}



static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd)

static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsit_cmd *cmd)

{

	struct iscsi_conn *conn = csk->conn;

	struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
@@ -1134,7 +1134,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) 


		ping_data[payload_length] = '\0';

		/*

		 * Attach ping data to struct iscsi_cmd->buf_ptr.

		 * Attach ping data to struct iscsit_cmd->buf_ptr.

		 */

		cmd->buf_ptr = ping_data;

		cmd->buf_ptr_size = payload_length;
@@ -1152,7 +1152,7 @@ static int cxgbit_handle_nop_out(struct cxgbit_sock *csk, struct iscsi_cmd *cmd) 
}



static int

cxgbit_handle_text_cmd(struct cxgbit_sock *csk, struct iscsi_cmd *cmd)

cxgbit_handle_text_cmd(struct cxgbit_sock *csk, struct iscsit_cmd *cmd)

{

	struct iscsi_conn *conn = csk->conn;

	struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);
@@ -1210,7 +1210,7 @@ static int cxgbit_target_rx_opcode(struct cxgbit_sock *csk) 
	struct cxgbit_lro_pdu_cb *pdu_cb = cxgbit_rx_pdu_cb(csk->skb);

	struct iscsi_hdr *hdr = (struct iscsi_hdr *)pdu_cb->hdr;

	struct iscsi_conn *conn = csk->conn;

	struct iscsi_cmd *cmd = NULL;

	struct iscsit_cmd *cmd = NULL;

	u8 opcode = (hdr->opcode & ISCSI_OPCODE_MASK);

	int ret = -EINVAL;