Commit fbe86dac authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi 

Pull SCSI updates from James Bottomley:
 "This consists of a small set of driver updates (lpfc, ufs, mpt3sas
  mpi3mr, iscsi target). Apart from that this is mostly small fixes with
  very few core changes (the biggest one being VPD caching)"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (177 commits)
  scsi: target: tcmu: Avoid holding XArray lock when calling lock_page
  scsi: elx: efct: Remove NULL check after calling container_of()
  scsi: dpt_i2o: Drop redundant spinlock initialization
  scsi: qedf: Remove redundant variable op
  scsi: hisi_sas: Fix memory ordering in hisi_sas_task_deliver()
  scsi: fnic: Replace DMA mask of 64 bits with 47 bits
  scsi: mpi3mr: Add target device related sysfs attributes
  scsi: mpi3mr: Add shost related sysfs attributes
  scsi: elx: efct: Remove redundant memset() statement
  scsi: megaraid_sas: Remove redundant memset() statement
  scsi: mpi3mr: Return error if dma_alloc_coherent() fails
  scsi: hisi_sas: Fix rescan after deleting a disk
  scsi: hisi_sas: Use sas_ata_wait_after_reset() in IT nexus reset
  scsi: libsas: Refactor sas_ata_hard_reset()
  scsi: mpt3sas: Update driver version to 42.100.00.00
  scsi: mpt3sas: Fix junk chars displayed while printing ChipName
  scsi: ipr: Use kobj_to_dev()
  scsi: mpi3mr: Fix a NULL vs IS_ERR() bug in mpi3mr_bsg_init()
  scsi: bnx2fc: Avoid using get_cpu() in bnx2fc_cmd_alloc()
  scsi: libfc: Remove get_cpu() semantics in fc_exch_em_alloc()
  ...
parents d7227785 325d5c5f

Documentation/ABI/testing/sysfs-driver-ufs

+11 −7
Original line number Diff line number Diff line
@@ -1518,7 +1518,7 @@ Description: This entry shows the number of reads that cannot be changed to 


		The file is read only.



What:		/sys/class/scsi_device/*/device/hpb_stats/rb_noti_cnt

What:		/sys/class/scsi_device/*/device/hpb_stats/rcmd_noti_cnt

Date:		June 2021

Contact:	Daejun Park <daejun7.park@samsung.com>

Description:	This entry shows the number of response UPIUs that has
@@ -1526,19 +1526,23 @@ Description: This entry shows the number of response UPIUs that has 


		The file is read only.



What:		/sys/class/scsi_device/*/device/hpb_stats/rb_active_cnt

What:		/sys/class/scsi_device/*/device/hpb_stats/rcmd_active_cnt

Date:		June 2021

Contact:	Daejun Park <daejun7.park@samsung.com>

Description:	This entry shows the number of active sub-regions recommended by

		response UPIUs.

Description:	For the HPB device control mode, this entry shows the number of

        active sub-regions recommended by response UPIUs. For the HPB host control

        mode, this entry shows the number of active sub-regions recommended by the

        HPB host control mode heuristic algorithm.



		The file is read only.



What:		/sys/class/scsi_device/*/device/hpb_stats/rb_inactive_cnt

What:		/sys/class/scsi_device/*/device/hpb_stats/rcmd_inactive_cnt

Date:		June 2021

Contact:	Daejun Park <daejun7.park@samsung.com>

Description:	This entry shows the number of inactive regions recommended by

		response UPIUs.

Description:	For the HPB device control mode, this entry shows the number of

        inactive regions recommended by response UPIUs. For the HPB host control

        mode, this entry shows the number of inactive regions recommended by the

        HPB host control mode heuristic algorithm.



		The file is read only.

drivers/infiniband/ulp/isert/ib_isert.c

+52 −52
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 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;
@@ -1020,21 +1020,21 @@ isert_rx_login_req(struct isert_conn *isert_conn) 
	schedule_delayed_work(&conn->login_work, 0);

}



static struct iscsi_cmd

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

static struct iscsit_cmd

*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;

	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,10 +1042,10 @@ 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;

	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,8 +1114,8 @@ 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 iscsi_cmd *cmd = NULL;

	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);

	int rc, sg_nents, sg_off, page_off;
@@ -1171,10 +1171,10 @@ 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;

	struct iscsit_conn *conn = isert_conn->conn;

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

	int rc;
@@ -1190,10 +1190,10 @@ 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;

	struct iscsit_conn *conn = isert_conn->conn;

	u32 payload_length = ntoh24(hdr->dlength);

	int rc;

	unsigned char *text_in = NULL;
@@ -1220,8 +1220,8 @@ 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 iscsi_cmd *cmd;

	struct iscsit_conn *conn = isert_conn->conn;

	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,9 +1426,9 @@ 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 iscsit_conn *conn = isert_conn->conn;

	struct iscsi_text_rsp *hdr;



	isert_dbg("Cmd %p\n", isert_cmd);
@@ -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 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 iscsi_cmd *cmd) 
}



static void

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



static int

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



static int

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



static int

isert_response_queue(struct iscsi_conn *conn, struct iscsi_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,9 +2521,9 @@ 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 iscsi_cmd *cmd, *tmp;

	struct iscsit_cmd *cmd, *tmp;

	static LIST_HEAD(drop_cmd_list);



	spin_lock_bh(&conn->cmd_lock);
@@ -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

+2 −2
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;
@@ -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/message/fusion/mptctl.c

+0 −3
Original line number Diff line number Diff line
@@ -2334,7 +2334,6 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size) 
	ToolboxIstwiReadWriteRequest_t	*IstwiRWRequest;

	MPT_FRAME_HDR		*mf = NULL;

	unsigned long		timeleft;

	int			retval;

	u32			msgcontext;



	/* Reset long to int. Should affect IA64 and SPARC only
@@ -2488,7 +2487,6 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size) 
	ioc->add_sge((char *)&IstwiRWRequest->SGL,

	    (MPT_SGE_FLAGS_SSIMPLE_READ|4), buf_dma);



	retval = 0;

	SET_MGMT_MSG_CONTEXT(ioc->ioctl_cmds.msg_context,

				IstwiRWRequest->MsgContext);

	INITIALIZE_MGMT_STATUS(ioc->ioctl_cmds.status)
@@ -2498,7 +2496,6 @@ mptctl_hp_hostinfo(MPT_ADAPTER *ioc, unsigned long arg, unsigned int data_size) 
	timeleft = wait_for_completion_timeout(&ioc->ioctl_cmds.done,

			HZ*MPT_IOCTL_DEFAULT_TIMEOUT);

	if (!(ioc->ioctl_cmds.status & MPT_MGMT_STATUS_COMMAND_GOOD)) {

		retval = -ETIME;

		printk(MYIOC_s_WARN_FMT "%s: failed\n", ioc->name, __func__);

		if (ioc->ioctl_cmds.status & MPT_MGMT_STATUS_DID_IOCRESET) {

			mpt_free_msg_frame(ioc, mf);

drivers/scsi/aacraid/aacraid.h

+1 −1
Original line number Diff line number Diff line
@@ -121,7 +121,7 @@ enum { 
#define SA_AIF_PDEV_CHANGE		(1<<4)

#define SA_AIF_LDEV_CHANGE		(1<<5)

#define SA_AIF_BPSTAT_CHANGE		(1<<30)

#define SA_AIF_BPCFG_CHANGE		(1<<31)

#define SA_AIF_BPCFG_CHANGE		(1U<<31)



#define HBA_MAX_SG_EMBEDDED		28

#define HBA_MAX_SG_SEPARATE		90