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

Commit 6fe1de43 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull SCSI fixes from James Bottomley:
 "This is the first sweep of mostly minor fixes. There's one security
  one: the read past the end of a buffer in qedf, and a panic fix for
  lpfc SLI-3 adapters, but the rest are a set of include and build
  dependency tidy ups and assorted other small fixes and updates"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: pmcraid: remove redundant check to see if request_size is less than zero
  scsi: lpfc: ensure els_wq is being checked before destroying it
  scsi: cxlflash: Select IRQ_POLL
  scsi: qedf: Avoid reading past end of buffer
  scsi: qedf: Cleanup the type of io_log->op
  scsi: lpfc: double lock typo in lpfc_ns_rsp()
  scsi: qedf: properly update arguments position in function call
  scsi: scsi_lib: Add #include <scsi/scsi_transport.h>
  scsi: MAINTAINERS: update OSD entries
  scsi: Skip deleted devices in __scsi_device_lookup
  scsi: lpfc: Fix panic on BFS configuration
  scsi: libfc: do not flood console with messages 'libfc: queue full ...'
parents 8c3fc164 b77b36cb

MAINTAINERS

+0 −4
Original line number Diff line number Diff line
@@ -9553,10 +9553,6 @@ F: drivers/net/wireless/intersil/orinoco/ 


OSD LIBRARY and FILESYSTEM

M:	Boaz Harrosh <ooo@electrozaur.com>

M:	Benny Halevy <bhalevy@primarydata.com>

L:	osd-dev@open-osd.org

W:	http://open-osd.org

T:	git git://git.open-osd.org/open-osd.git

S:	Maintained

F:	drivers/scsi/osd/

F:	include/scsi/osd_*

drivers/scsi/cxlflash/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -5,6 +5,7 @@ 
config CXLFLASH

	tristate "Support for IBM CAPI Flash"

	depends on PCI && SCSI && CXL && EEH

	select IRQ_POLL

	default m

	help

	  Allows CAPI Accelerated IO to Flash

drivers/scsi/libfc/fc_fcp.c

+9 −6
Original line number Diff line number Diff line
@@ -407,11 +407,12 @@ static void fc_fcp_can_queue_ramp_up(struct fc_lport *lport) 
 * can_queue. Eventually we will hit the point where we run

 * on all reserved structs.

 */

static void fc_fcp_can_queue_ramp_down(struct fc_lport *lport)

static bool fc_fcp_can_queue_ramp_down(struct fc_lport *lport)

{

	struct fc_fcp_internal *si = fc_get_scsi_internal(lport);

	unsigned long flags;

	int can_queue;

	bool changed = false;



	spin_lock_irqsave(lport->host->host_lock, flags);
@@ -427,9 +428,11 @@ static void fc_fcp_can_queue_ramp_down(struct fc_lport *lport) 
	if (!can_queue)

		can_queue = 1;

	lport->host->can_queue = can_queue;

	changed = true;



unlock:

	spin_unlock_irqrestore(lport->host->host_lock, flags);

	return changed;

}



/*
@@ -1896,7 +1899,7 @@ int fc_queuecommand(struct Scsi_Host *shost, struct scsi_cmnd *sc_cmd) 


	if (!fc_fcp_lport_queue_ready(lport)) {

		if (lport->qfull) {

			fc_fcp_can_queue_ramp_down(lport);

			if (fc_fcp_can_queue_ramp_down(lport))

				shost_printk(KERN_ERR, lport->host,

					     "libfc: queue full, "

					     "reducing can_queue to %d.\n",

drivers/scsi/lpfc/lpfc_crtn.h

+1 −0
Original line number Diff line number Diff line
@@ -294,6 +294,7 @@ int lpfc_selective_reset(struct lpfc_hba *); 
void lpfc_reset_barrier(struct lpfc_hba *);

int lpfc_sli_brdready(struct lpfc_hba *, uint32_t);

int lpfc_sli_brdkill(struct lpfc_hba *);

int lpfc_sli_chipset_init(struct lpfc_hba *phba);

int lpfc_sli_brdreset(struct lpfc_hba *);

int lpfc_sli_brdrestart(struct lpfc_hba *);

int lpfc_sli_hba_setup(struct lpfc_hba *);

drivers/scsi/lpfc/lpfc_ct.c

+1 −1
Original line number Diff line number Diff line
@@ -630,7 +630,7 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint8_t fc4_type, 
						NLP_EVT_DEVICE_RECOVERY);

			spin_lock_irq(shost->host_lock);

			ndlp->nlp_flag &= ~NLP_NVMET_RECOV;

			spin_lock_irq(shost->host_lock);

			spin_unlock_irq(shost->host_lock);

		}

	}