Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 91d41fdf authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending 

* 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending:
  target: Convert to DIV_ROUND_UP_SECTOR_T usage for sectors / dev_max_sectors
  kernel.h: Add DIV_ROUND_UP_ULL and DIV_ROUND_UP_SECTOR_T macro usage
  iscsi-target: Add iSCSI fabric support for target v4.1
  iscsi: Add Serial Number Arithmetic LT and GT into iscsi_proto.h
  iscsi: Use struct scsi_lun in iscsi structs instead of u8[8]
  iscsi: Resolve iscsi_proto.h naming conflicts with drivers/target/iscsi
parents c1095c6d 277c5f27

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
@@ -332,11 +332,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;
@@ -1349,7 +1349,7 @@ 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;
@@ -1376,7 +1376,7 @@ 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
@@ -1213,7 +1213,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 (atomic_read(&bnx2i_conn->ep->num_active_cmds) + 1  >

	    hba->max_sqes)

drivers/scsi/libiscsi.c

+3 −19
Original line number Diff line number Diff line
@@ -84,22 +84,6 @@ MODULE_PARM_DESC(debug_libiscsi_eh, 
					     __func__, ##arg);		\

	} while (0);



/* Serial Number Arithmetic, 32 bits, less than, RFC1982 */

#define SNA32_CHECK 2147483648UL



static int iscsi_sna_lt(u32 n1, u32 n2)

{

	return n1 != n2 && ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) ||

			    (n1 > n2 && (n2 - n1 < SNA32_CHECK)));

}



/* Serial Number Arithmetic, 32 bits, less than, RFC1982 */

static int iscsi_sna_lte(u32 n1, u32 n2)

{

	return n1 == n2 || ((n1 < n2 && (n2 - n1 < SNA32_CHECK)) ||

			    (n1 > n2 && (n2 - n1 < SNA32_CHECK)));

}



inline void iscsi_conn_queue_work(struct iscsi_conn *conn)

{

	struct Scsi_Host *shost = conn->session->host;
@@ -360,7 +344,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 +358,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 +814,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;