Commit 138f371d 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 more SCSI updates from James Bottomley:
 "Eleven patches, all in drivers (no core changes) that are either minor
  cleanups or small fixes.

  They were late arriving, but still safe for -rc1"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: MAINTAINERS: Add the linux-scsi mailing list to the ISCSI entry
  scsi: megaraid_sas: Make poll_aen_lock static
  scsi: sd_zbc: Improve report zones error printout
  scsi: qla2xxx: Fix qla2x00_request_irqs() for MSI
  scsi: qla2xxx: unregister ports after GPN_FT failure
  scsi: qla2xxx: fix rports not being mark as lost in sync fabric scan
  scsi: pm80xx: Remove unused include of linux/version.h
  scsi: pm80xx: fix logic to break out of loop when register value is 2 or 3
  scsi: scsi_transport_sas: Fix memory leak when removing devices
  scsi: lpfc: size cpu map by last cpu id set
  scsi: ibmvscsi_tgt: Remove unneeded variable rc
parents a78f7cdd 1eb9151e

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -8764,6 +8764,7 @@ ISCSI 
M:	Lee Duncan <lduncan@suse.com>

M:	Chris Leech <cleech@redhat.com>

L:	open-iscsi@googlegroups.com

L:	linux-scsi@vger.kernel.org

W:	www.open-iscsi.com

S:	Maintained

F:	drivers/scsi/*iscsi*

drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c

+1 −2
Original line number Diff line number Diff line
@@ -2354,7 +2354,6 @@ static long ibmvscsis_srp_i_logout(struct scsi_info *vscsi, 
{

	struct iu_entry *iue = cmd->iue;

	struct srp_i_logout *log_out = &vio_iu(iue)->srp.i_logout;

	long rc = ADAPT_SUCCESS;



	if ((vscsi->debit > 0) || !list_empty(&vscsi->schedule_q) ||

	    !list_empty(&vscsi->waiting_rsp)) {
@@ -2370,7 +2369,7 @@ static long ibmvscsis_srp_i_logout(struct scsi_info *vscsi, 
		ibmvscsis_post_disconnect(vscsi, WAIT_IDLE, 0);

	}



	return rc;

	return ADAPT_SUCCESS;

}



/* Called with intr lock held */

drivers/scsi/lpfc/lpfc_init.c

+1 −1
Original line number Diff line number Diff line
@@ -6460,7 +6460,7 @@ lpfc_sli4_driver_resource_setup(struct lpfc_hba *phba) 
	u32 if_fam;



	phba->sli4_hba.num_present_cpu = lpfc_present_cpu;

	phba->sli4_hba.num_possible_cpu = num_possible_cpus();

	phba->sli4_hba.num_possible_cpu = cpumask_last(cpu_possible_mask) + 1;

	phba->sli4_hba.curr_disp_cpu = 0;

	lpfc_cpumask_of_node_init(phba);

drivers/scsi/megaraid/megaraid_sas_base.c

+1 −1
Original line number Diff line number Diff line
@@ -199,7 +199,7 @@ static bool support_nvme_encapsulation; 
static bool support_pci_lane_margining;



/* define lock for aen poll */

spinlock_t poll_aen_lock;

static spinlock_t poll_aen_lock;



extern struct dentry *megasas_debugfs_root;

extern void megasas_init_debugfs(void);

drivers/scsi/pm8001/pm80xx_hwi.c

+1 −2
Original line number Diff line number Diff line
@@ -37,7 +37,6 @@ 
 * POSSIBILITY OF SUCH DAMAGES.

 *

 */

 #include <linux/version.h>

 #include <linux/slab.h>

 #include "pm8001_sas.h"

 #include "pm80xx_hwi.h"
@@ -348,7 +347,7 @@ ssize_t pm80xx_get_fatal_dump(struct device *cdev, 
			do {

				reg_val = pm8001_mr32(fatal_table_address,

					MPI_FATAL_EDUMP_TABLE_STATUS);

			} while (((reg_val != 2) || (reg_val != 3)) &&

			} while (((reg_val != 2) && (reg_val != 3)) &&

					time_before(jiffies, start));



			if (reg_val < 2) {