Commit 12352183 authored by Nicholas Bellinger's avatar Nicholas Bellinger
Browse files

iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi 



This patch renames the following iscsi_proto.h structures to avoid
namespace issues with drivers/target/iscsi/iscsi_target_core.h:

*) struct iscsi_cmd -> struct iscsi_scsi_req
*) struct iscsi_cmd_rsp -> struct iscsi_scsi_rsp
*) struct iscsi_login -> struct iscsi_login_req

This patch includes useful ISCSI_FLAG_LOGIN_[CURRENT,NEXT]_STAGE*,
and ISCSI_FLAG_SNACK_TYPE_* definitions used by iscsi_target_mod, and
fixes the incorrect definition of struct iscsi_snack to following
RFC-3720 Section 10.16. SNACK Request.

Also, this patch updates libiscsi, iSER, be2iscsi, and bn2xi to
use the updated structure definitions in a handful of locations.

Signed-off-by: default avatarMike Christie <michaelc@cs.wisc.edu>
Signed-off-by: default avatarNicholas A. Bellinger <nab@linux-iscsi.org>
parent bbd9d6f7

drivers/infiniband/ulp/iser/iser_initiator.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ int iser_send_command(struct iscsi_conn *conn, 
	unsigned long edtl;

	int err;

	struct iser_data_buf *data_buf;

	struct iscsi_cmd *hdr =  (struct iscsi_cmd *)task->hdr;

	struct iscsi_scsi_req *hdr = (struct iscsi_scsi_req *)task->hdr;

	struct scsi_cmnd *sc  =  task->sc;

	struct iser_tx_desc *tx_desc = &iser_task->desc;

drivers/scsi/be2iscsi/be_main.h

+2 −2
Original line number Diff line number Diff line
@@ -397,7 +397,7 @@ struct amap_pdu_data_out { 
};



struct be_cmd_bhs {

	struct iscsi_cmd iscsi_hdr;

	struct iscsi_scsi_req iscsi_hdr;

	unsigned char pad1[16];

	struct pdu_data_out iscsi_data_pdu;

	unsigned char pad2[BE_SENSE_INFO_SIZE -
@@ -428,7 +428,7 @@ struct be_nonio_bhs { 
};



struct be_status_bhs {

	struct iscsi_cmd iscsi_hdr;

	struct iscsi_scsi_req iscsi_hdr;

	unsigned char pad1[16];

	/**

	 * The plus 2 below is to hold the sense info length that gets

drivers/scsi/bnx2i/bnx2i_hwi.c

+4 −4
Original line number Diff line number Diff line
@@ -328,11 +328,11 @@ int bnx2i_send_iscsi_login(struct bnx2i_conn *bnx2i_conn, 
{

	struct bnx2i_cmd *bnx2i_cmd;

	struct bnx2i_login_request *login_wqe;

	struct iscsi_login *login_hdr;

	struct iscsi_login_req *login_hdr;

	u32 dword;



	bnx2i_cmd = (struct bnx2i_cmd *)task->dd_data;

	login_hdr = (struct iscsi_login *)task->hdr;

	login_hdr = (struct iscsi_login_req *)task->hdr;

	login_wqe = (struct bnx2i_login_request *)

						bnx2i_conn->ep->qp.sq_prod_qe;
@@ -1344,7 +1344,7 @@ static int bnx2i_process_scsi_cmd_resp(struct iscsi_session *session, 
	struct bnx2i_cmd_response *resp_cqe;

	struct bnx2i_cmd *bnx2i_cmd;

	struct iscsi_task *task;

	struct iscsi_cmd_rsp *hdr;

	struct iscsi_scsi_rsp *hdr;

	u32 datalen = 0;



	resp_cqe = (struct bnx2i_cmd_response *)cqe;
@@ -1371,7 +1371,7 @@ static int bnx2i_process_scsi_cmd_resp(struct iscsi_session *session, 
	}

	bnx2i_iscsi_unmap_sg_list(bnx2i_cmd);



	hdr = (struct iscsi_cmd_rsp *)task->hdr;

	hdr = (struct iscsi_scsi_rsp *)task->hdr;

	resp_cqe = (struct bnx2i_cmd_response *)cqe;

	hdr->opcode = resp_cqe->op_code;

	hdr->max_cmdsn = cpu_to_be32(resp_cqe->max_cmd_sn);

drivers/scsi/bnx2i/bnx2i_iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ static int bnx2i_task_xmit(struct iscsi_task *task) 
	struct bnx2i_conn *bnx2i_conn = conn->dd_data;

	struct scsi_cmnd *sc = task->sc;

	struct bnx2i_cmd *cmd = task->dd_data;

	struct iscsi_cmd *hdr = (struct iscsi_cmd *) task->hdr;

	struct iscsi_scsi_req *hdr = (struct iscsi_scsi_req *)task->hdr;



	if (bnx2i_conn->ep->num_active_cmds + 1 > hba->max_sqes)

		return -ENOMEM;

drivers/scsi/libiscsi.c

+3 −3
Original line number Diff line number Diff line
@@ -360,7 +360,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task) 
	struct iscsi_conn *conn = task->conn;

	struct iscsi_session *session = conn->session;

	struct scsi_cmnd *sc = task->sc;

	struct iscsi_cmd *hdr;

	struct iscsi_scsi_req *hdr;

	unsigned hdrlength, cmd_len;

	itt_t itt;

	int rc;
@@ -374,7 +374,7 @@ static int iscsi_prep_scsi_cmd_pdu(struct iscsi_task *task) 
		if (rc)

			return rc;

	}

	hdr = (struct iscsi_cmd *) task->hdr;

	hdr = (struct iscsi_scsi_req *)task->hdr;

	itt = hdr->itt;

	memset(hdr, 0, sizeof(*hdr));
@@ -830,7 +830,7 @@ static void iscsi_scsi_cmd_rsp(struct iscsi_conn *conn, struct iscsi_hdr *hdr, 
			       struct iscsi_task *task, char *data,

			       int datalen)

{

	struct iscsi_cmd_rsp *rhdr = (struct iscsi_cmd_rsp *)hdr;

	struct iscsi_scsi_rsp *rhdr = (struct iscsi_scsi_rsp *)hdr;

	struct iscsi_session *session = conn->session;

	struct scsi_cmnd *sc = task->sc;

CRA Git | Maintained and supported by SUSTech CRA and CCSE