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

fbe86dac · Linus Torvalds <[email protected]> · 2022-05-25 19:09:48 -07:00

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()
  ...

Commit: fbe86daca0ba878b04fa241b85e26e54d17d4229
Parents: d7227785 · 325d5c5f

Merge commit. Changes below are compared with the first parent: d7227785.

Changes

169 files changed · +6840 −3470

File	Status	Add	Del	Content
Documentation/ABI/testing/sysfs-driver-ufs	modified	+11	−7	View file
drivers/infiniband/ulp/isert/ib_isert.c	modified	+52	−52	View file
drivers/infiniband/ulp/isert/ib_isert.h	modified	+2	−2	View file
drivers/message/fusion/mptctl.c	modified	+0	−3	View file
drivers/scsi/aacraid/aacraid.h	modified	+1	−1	View file
drivers/scsi/aha1542.c	modified	+10	−10	View file
drivers/scsi/bfa/bfad_debugfs.c	modified	+1	−2	View file
drivers/scsi/bfa/bfad_im.c	modified	+0	−1	View file
drivers/scsi/bnx2fc/bnx2fc_fcoe.c	modified	+6	−16	View file
drivers/scsi/bnx2fc/bnx2fc_io.c	modified	+6	−11	View file
drivers/scsi/dc395x.c	modified	+12	−3	View file
drivers/scsi/dpt_i2o.c	modified	+0	−1	View file
drivers/scsi/elx/efct/efct_hw.c	modified	+0	−1	View file
drivers/scsi/elx/efct/efct_io.c	modified	+0	−1	View file
drivers/scsi/elx/efct/efct_lio.c	modified	+0	−3	View file
drivers/scsi/fcoe/fcoe.c	modified	+17	−27	View file
drivers/scsi/fcoe/fcoe_ctlr.c	modified	+9	−17	View file
drivers/scsi/fcoe/fcoe_transport.c	modified	+3	−3	View file
drivers/scsi/fnic/fnic.h	modified	+1	−1	View file
drivers/scsi/fnic/fnic_debugfs.c	modified	+1	−2	View file
drivers/scsi/fnic/fnic_main.c	modified	+4	−6	View file
drivers/scsi/hisi_sas/hisi_sas_main.c	modified	+32	−36	View file
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c	modified	+8	−2	View file
drivers/scsi/hosts.c	modified	+4	−4	View file
drivers/scsi/ipr.c	modified	+6	−7	View file
drivers/scsi/libfc/fc_exch.c	modified	+1	−2	View file
drivers/scsi/libfc/fc_fcp.c	modified	+10	−19	View file
drivers/scsi/libfc/fc_lport.c	modified	+15	−15	View file
drivers/scsi/libsas/sas_ata.c	modified	+27	−14	View file
drivers/scsi/lpfc/lpfc.h	modified	+7	−3	View file
drivers/scsi/lpfc/lpfc_attr.c	modified	+41	−14	View file
drivers/scsi/lpfc/lpfc_bsg.c	modified	+36	−45	View file
drivers/scsi/lpfc/lpfc_crtn.h	modified	+4	−1	View file
drivers/scsi/lpfc/lpfc_ct.c	modified	+246	−120	View file
drivers/scsi/lpfc/lpfc_els.c	modified	+338	−377	View file
drivers/scsi/lpfc/lpfc_hbadisc.c	modified	+63	−101	View file
drivers/scsi/lpfc/lpfc_hw.h	modified	+44	−31	View file
drivers/scsi/lpfc/lpfc_hw4.h	modified	+12	−5	View file
drivers/scsi/lpfc/lpfc_init.c	modified	+131	−143	View file
drivers/scsi/lpfc/lpfc_logmsg.h	modified	+4	−4	View file
drivers/scsi/lpfc/lpfc_mbox.c	modified	+120	−83	View file
drivers/scsi/lpfc/lpfc_nportdisc.c	modified	+38	−41	View file
drivers/scsi/lpfc/lpfc_nvme.c	modified	+25	−19	View file
drivers/scsi/lpfc/lpfc_nvmet.c	modified	+37	−36	View file
drivers/scsi/lpfc/lpfc_scsi.c	modified	+34	−38	View file
drivers/scsi/lpfc/lpfc_sli.c	modified	+129	−141	View file
drivers/scsi/lpfc/lpfc_sli.h	modified	+24	−10	View file
drivers/scsi/lpfc/lpfc_sli4.h	modified	+3	−0	View file
drivers/scsi/lpfc/lpfc_version.h	modified	+1	−1	View file
drivers/scsi/lpfc/lpfc_vport.c	modified	+14	−17	View file
drivers/scsi/mac53c94.c	modified	+1	−1	View file
drivers/scsi/megaraid.c	modified	+1	−1	View file
drivers/scsi/megaraid/megaraid_sas_base.c	modified	+0	−2	View file
drivers/scsi/megaraid/megaraid_sas_fusion.c	modified	+0	−2	View file
drivers/scsi/mpi3mr/Kconfig	modified	+1	−0	View file
drivers/scsi/mpi3mr/Makefile	modified	+1	−0	View file
drivers/scsi/mpi3mr/mpi/mpi30_init.h	modified	+0	−53	View file
drivers/scsi/mpi3mr/mpi/mpi30_ioc.h	modified	+0	−27	View file
drivers/scsi/mpi3mr/mpi/mpi30_pci.h	modified	+1	−30	View file
drivers/scsi/mpi3mr/mpi3mr.h	modified	+130	−7	View file
drivers/scsi/mpi3mr/mpi3mr_app.c	added	+1864	−0	View file
drivers/scsi/mpi3mr/mpi3mr_debug.h	modified	+31	−6	View file
drivers/scsi/mpi3mr/mpi3mr_fw.c	modified	+332	−3	View file
drivers/scsi/mpi3mr/mpi3mr_os.c	modified	+66	−5	View file
drivers/scsi/mpt3sas/mpt3sas_base.c	modified	+17	−17	View file
drivers/scsi/mpt3sas/mpt3sas_base.h	modified	+3	−3	View file
drivers/scsi/mpt3sas/mpt3sas_ctl.c	modified	+6	−5	View file
drivers/scsi/mpt3sas/mpt3sas_scsih.c	modified	+11	−13	View file
drivers/scsi/pmcraid.c	modified	+1	−1	View file
drivers/scsi/qedf/qedf_attr.c	modified	+0	−2	View file
drivers/scsi/qedf/qedf_io.c	modified	+1	−2	View file
drivers/scsi/qedf/qedf_main.c	modified	+5	−8	View file
drivers/scsi/qla2xxx/qla_edif.c	modified	+1	−2	View file
drivers/scsi/qla2xxx/qla_os.c	modified	+0	−1	View file
drivers/scsi/qla2xxx/qla_target.c	modified	+0	−2	View file
drivers/scsi/qla2xxx/qla_target.h	modified	+0	−1	View file
drivers/scsi/qla4xxx/ql4_os.c	modified	+0	−1	View file
drivers/scsi/scsi.c	modified	+79	−37	View file
drivers/scsi/scsi_debug.c	modified	+114	−35	View file
drivers/scsi/scsi_lib.c	modified	+1	−1	View file
drivers/scsi/scsi_scan.c	modified	+11	−1	View file
drivers/scsi/scsi_sysfs.c	modified	+28	−0	View file
drivers/scsi/sd.c	modified	+118	−75	View file
drivers/scsi/sd.h	modified	+26	−7	View file
drivers/scsi/sd_dif.c	modified	+3	−5	View file
drivers/scsi/sd_zbc.c	modified	+184	−52	View file
drivers/scsi/sr.c	modified	+8	−6	View file
drivers/scsi/ufs/Kconfig	modified	+1	−25	View file
drivers/scsi/ufs/cdns-pltfrm.c	modified	+1	−1	View file
drivers/scsi/ufs/tc-dwc-g210-pci.c	modified	+1	−0	View file
drivers/scsi/ufs/tc-dwc-g210-pltfrm.c	modified	+1	−0	View file
drivers/scsi/ufs/tc-dwc-g210.c	modified	+2	−0	View file
drivers/scsi/ufs/tc-dwc-g210.h	modified	+2	−0	View file
drivers/scsi/ufs/ti-j721e-ufs.c	modified	+2	−4	View file
drivers/scsi/ufs/ufs-debugfs.c	modified	+1	−0	View file
drivers/scsi/ufs/ufs-exynos.c	modified	+3	−2	View file
drivers/scsi/ufs/ufs-exynos.h	modified	+4	−4	View file
drivers/scsi/ufs/ufs-hisi.c	modified	+2	−0	View file
drivers/scsi/ufs/ufs-hwmon.c	modified	+1	−0	View file
drivers/scsi/ufs/ufs-mediatek.c	modified	+12	−19	View file
drivers/scsi/ufs/ufs-qcom-ice.c	modified	+1	−1	View file
drivers/scsi/ufs/ufs-qcom.c	modified	+25	−48	View file
drivers/scsi/ufs/ufs-qcom.h	modified	+2	−4	View file
drivers/scsi/ufs/ufs-sysfs.c	modified	+1	−0	View file
drivers/scsi/ufs/ufs-sysfs.h	modified	+2	−1	View file
drivers/scsi/ufs/ufs.h	modified	+0	−35	View file
drivers/scsi/ufs/ufs_bsg.c	modified	+6	−0	View file
drivers/scsi/ufs/ufs_bsg.h	modified	+1	−6	View file
drivers/scsi/ufs/ufs_quirks.h	modified	+3	−12	View file
drivers/scsi/ufs/ufshcd-crypto.h	modified	+4	−1	View file
drivers/scsi/ufs/ufshcd-dwc.c	modified	+2	−0	View file
drivers/scsi/ufs/ufshcd-dwc.h	modified	+2	−0	View file
drivers/scsi/ufs/ufshcd-pci.c	modified	+2	−2	View file
drivers/scsi/ufs/ufshcd-pltfrm.c	modified	+20	−18	View file
drivers/scsi/ufs/ufshcd-priv.h	added	+298	−0	View file
drivers/scsi/ufs/ufshcd.c	modified	+116	−131	View file
drivers/scsi/ufs/ufshcd.h	modified	+80	−288	View file
drivers/scsi/ufs/ufshci.h	modified	+2	−0	View file
drivers/scsi/ufs/ufshpb.c	modified	+112	−91	View file
drivers/scsi/ufs/ufshpb.h	modified	+7	−9	View file
drivers/scsi/ufs/unipro.h	modified	+1	−17	View file
drivers/scsi/vmw_pvscsi.c	modified	+0	−1	View file
drivers/target/iscsi/cxgbit/cxgbit.h	modified	+11	−11	View file
drivers/target/iscsi/cxgbit/cxgbit_cm.c	modified	+4	−4	View file
drivers/target/iscsi/cxgbit/cxgbit_ddp.c	modified	+2	−2	View file
drivers/target/iscsi/cxgbit/cxgbit_main.c	modified	+1	−1	View file
drivers/target/iscsi/cxgbit/cxgbit_target.c	modified	+36	−36	View file
drivers/target/iscsi/iscsi_target.c	modified	+136	−136	View file
drivers/target/iscsi/iscsi_target.h	modified	+15	−15	View file
drivers/target/iscsi/iscsi_target_auth.c	modified	+5	−5	View file
drivers/target/iscsi/iscsi_target_auth.h	modified	+2	−2	View file
drivers/target/iscsi/iscsi_target_configfs.c	modified	+17	−17	View file
drivers/target/iscsi/iscsi_target_datain_values.c	modified	+14	−14	View file
drivers/target/iscsi/iscsi_target_datain_values.h	modified	+6	−6	View file
drivers/target/iscsi/iscsi_target_device.c	modified	+2	−2	View file
drivers/target/iscsi/iscsi_target_device.h	modified	+4	−4	View file
drivers/target/iscsi/iscsi_target_erl0.c	modified	+34	−34	View file
drivers/target/iscsi/iscsi_target_erl0.h	modified	+12	−12	View file
drivers/target/iscsi/iscsi_target_erl1.c	modified	+46	−46	View file
drivers/target/iscsi/iscsi_target_erl1.h	modified	+20	−20	View file
drivers/target/iscsi/iscsi_target_erl2.c	modified	+24	−24	View file
drivers/target/iscsi/iscsi_target_erl2.h	modified	+13	−13	View file
drivers/target/iscsi/iscsi_target_login.c	modified	+39	−39	View file
drivers/target/iscsi/iscsi_target_login.h	modified	+11	−11	View file
drivers/target/iscsi/iscsi_target_nego.c	modified	+30	−30	View file
drivers/target/iscsi/iscsi_target_nego.h	modified	+6	−6	View file
drivers/target/iscsi/iscsi_target_nodeattrib.c	modified	+2	−2	View file
drivers/target/iscsi/iscsi_target_parameters.c	modified	+4	−4	View file
drivers/target/iscsi/iscsi_target_parameters.h	modified	+4	−4	View file
drivers/target/iscsi/iscsi_target_seq_pdu_list.c	modified	+22	−22	View file
drivers/target/iscsi/iscsi_target_seq_pdu_list.h	modified	+5	−5	View file
drivers/target/iscsi/iscsi_target_stat.c	modified	+8	−8	View file
drivers/target/iscsi/iscsi_target_tmr.c	modified	+36	−36	View file
drivers/target/iscsi/iscsi_target_tmr.h	modified	+8	−8	View file
drivers/target/iscsi/iscsi_target_tpg.c	modified	+1	−1	View file
drivers/target/iscsi/iscsi_target_tpg.h	modified	+2	−2	View file
drivers/target/iscsi/iscsi_target_util.c	modified	+82	−82	View file
drivers/target/iscsi/iscsi_target_util.h	modified	+51	−51	View file
drivers/target/target_core_configfs.c	modified	+28	−19	View file
drivers/target/target_core_spc.c	modified	+1	−1	View file
drivers/target/target_core_user.c	modified	+42	−8	View file
include/scsi/libfcoe.h	modified	+2	−0	View file
include/scsi/libiscsi.h	modified	+3	−3	View file
include/scsi/sas_ata.h	modified	+7	−0	View file
include/scsi/scsi_device.h	modified	+8	−1	View file
include/scsi/scsi_proto.h	modified	+8	−1	View file
include/target/iscsi/iscsi_target_core.h	modified	+26	−26	View file
include/target/iscsi/iscsi_transport.h	modified	+63	−63	View file
include/uapi/scsi/scsi_bsg_mpi3mr.h	added	+582	−0	View file

Only the first 600 diff lines are shown. Download the complete patch.

Documentation/ABI/testing/sysfs-driver-ufs

View file

diff --git a/Documentation/ABI/testing/sysfs-driver-ufs b/Documentation/ABI/testing/sysfs-driver-ufs
index a44ef8b..6b248ab 100644
--- a/Documentation/ABI/testing/sysfs-driver-ufs
+++ b/Documentation/ABI/testing/sysfs-driver-ufs
@@ -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 <[email protected]>
 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 <[email protected]>
-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 <[email protected]>
-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

View file

diff --git a/drivers/infiniband/ulp/isert/ib_isert.c b/drivers/infiniband/ulp/isert/ib_isert.c
index 636d590..48064bd 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.c
+++ b/drivers/infiniband/ulp/isert/ib_isert.c
@@ -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 @@ rdma_ctx_post:
 }
 
 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

View file

diff --git a/drivers/infiniband/ulp/isert/ib_isert.h b/drivers/infiniband/ulp/isert/ib_isert.h
index ca8cfeb..0b2dfd6 100644
--- a/drivers/infiniband/ulp/isert/ib_isert.h
+++ b/drivers/infiniband/ulp/isert/ib_isert.h
@@ -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

View file

diff --git a/drivers/message/fusion/mptctl.c b/drivers/message/fusion/mptctl.c
index 03c8fb1..f9ee957 100644
--- a/drivers/message/fusion/mptctl.c
+++ b/drivers/message/fusion/mptctl.c
@@ -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 @@ retry_wait:
 	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

View file

diff --git a/drivers/scsi/aacraid/aacraid.h b/drivers/scsi/aacraid/aacraid.h
index f849e7c..5e115e8 100644
--- a/drivers/scsi/aacraid/aacraid.h
+++ b/drivers/scsi/aacraid/aacraid.h
@@ -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

drivers/scsi/aha1542.c

View file

diff --git a/drivers/scsi/aha1542.c b/drivers/scsi/aha1542.c
index cf7bba2..552ca95 100644
--- a/drivers/scsi/aha1542.c
+++ b/drivers/scsi/aha1542.c
@@ -302,7 +302,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 		if (flag & SCRD)
 			printk("SCRD ");
 		printk("status %02x\n", inb(STATUS(sh->io_port)));
-	};
+	}
 #endif
 	number_serviced = 0;
 
@@ -344,7 +344,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 			if (!number_serviced)
 				shost_printk(KERN_WARNING, sh, "interrupt received, but no mail.\n");
 			return IRQ_HANDLED;
-		};
+		}
 
 		mbo = (scsi2int(mb[mbi].ccbptr) - (unsigned long)aha1542->ccb_handle) / sizeof(struct ccb);
 		mbistatus = mb[mbi].status;
@@ -408,7 +408,7 @@ static irqreturn_t aha1542_interrupt(int irq, void *dev_id)
 						 */
 		scsi_done(tmp_cmd);
 		number_serviced++;
-	};
+	}
 }
 
 static int aha1542_queuecommand(struct Scsi_Host *sh, struct scsi_cmnd *cmd)
@@ -534,7 +534,7 @@ static void setup_mailboxes(struct Scsi_Host *sh)
 		any2scsi(aha1542->mb[i].ccbptr,
 			 aha1542->ccb_handle + i * sizeof(struct ccb));
 		aha1542->mb[AHA1542_MAILBOXES + i].status = 0;
-	};
+	}
 	aha1542_intr_reset(sh->io_port);	/* reset interrupts, so they don't block */
 	any2scsi(mb_cmd + 2, aha1542->mb_handle);
 	if (aha1542_out(sh->io_port, mb_cmd, 5))
@@ -549,7 +549,7 @@ static int aha1542_getconfig(struct Scsi_Host *sh)
 	i = inb(STATUS(sh->io_port));
 	if (i & DF) {
 		i = inb(DATA(sh->io_port));
-	};
+	}
 	aha1542_outb(sh->io_port, CMD_RETCONF);
 	aha1542_in(sh->io_port, inquiry_result, 3, 0);
 	if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 0))
@@ -578,7 +578,7 @@ static int aha1542_getconfig(struct Scsi_Host *sh)
 	default:
 		shost_printk(KERN_ERR, sh, "Unable to determine DMA channel.\n");
 		return -1;
-	};
+	}
 	switch (inquiry_result[1]) {
 	case 0x40:
 		sh->irq = 15;
@@ -601,7 +601,7 @@ static int aha1542_getconfig(struct Scsi_Host *sh)
 	default:
 		shost_printk(KERN_ERR, sh, "Unable to determine IRQ level.\n");
 		return -1;
-	};
+	}
 	sh->this_id = inquiry_result[2] & 7;
 	return 0;
 }
@@ -636,7 +636,7 @@ static int aha1542_mbenable(struct Scsi_Host *sh)
 
 		if (aha1542_out(sh->io_port, mbenable_cmd, 3))
 			goto fail;
-	};
+	}
 	while (0) {
 fail:
 		shost_printk(KERN_ERR, sh, "Mailbox init failed\n");
@@ -654,7 +654,7 @@ static int aha1542_query(struct Scsi_Host *sh)
 	i = inb(STATUS(sh->io_port));
 	if (i & DF) {
 		i = inb(DATA(sh->io_port));
-	};
+	}
 	aha1542_outb(sh->io_port, CMD_INQUIRY);
 	aha1542_in(sh->io_port, inquiry_result, 4, 0);
 	if (!wait_mask(INTRFLAGS(sh->io_port), INTRMASK, HACC, 0, 0))
@@ -673,7 +673,7 @@ static int aha1542_query(struct Scsi_Host *sh)
 	if (inquiry_result[0] == 0x43) {