Commit 1c4e395c 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:
 "Nine changes, eight to drivers (qla2xxx, hpsa, lpfc, alua, ch,
  53c710[x2], target) and one core change that tries to close a race
  between sysfs delete and module removal"

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: lpfc: remove left-over BUILD_NVME defines
  scsi: core: try to get module before removing device
  scsi: hpsa: add missing hunks in reset-patch
  scsi: target: core: Do not overwrite CDB byte 1
  scsi: ch: Make it possible to open a ch device multiple times again
  scsi: fix kconfig dependency warning related to 53C700_LE_ON_BE
  scsi: sni_53c710: fix compilation error
  scsi: scsi_dh_alua: handle RTPG sense code correctly during state transitions
  scsi: qla2xxx: fix a potential NULL pointer dereference
parents b4b61b22 1052b41b

drivers/scsi/Kconfig

+1 −1
Original line number Diff line number Diff line
@@ -898,7 +898,7 @@ config SCSI_SNI_53C710 


config 53C700_LE_ON_BE

	bool

	depends on SCSI_LASI700

	depends on SCSI_LASI700 || SCSI_SNI_53C710

	default y



config SCSI_STEX

drivers/scsi/ch.c

+0 −1
Original line number Diff line number Diff line
@@ -579,7 +579,6 @@ ch_release(struct inode *inode, struct file *file) 
	scsi_changer *ch = file->private_data;



	scsi_device_put(ch->device);

	ch->device = NULL;

	file->private_data = NULL;

	kref_put(&ch->ref, ch_destroy);

	return 0;

drivers/scsi/device_handler/scsi_dh_alua.c

+16 −5
Original line number Diff line number Diff line
@@ -512,6 +512,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) 
	unsigned int tpg_desc_tbl_off;

	unsigned char orig_transition_tmo;

	unsigned long flags;

	bool transitioning_sense = false;



	if (!pg->expiry) {

		unsigned long transition_tmo = ALUA_FAILOVER_TIMEOUT * HZ;
@@ -572,13 +573,19 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) 
			goto retry;

		}

		/*

		 * Retry on ALUA state transition or if any

		 * UNIT ATTENTION occurred.

		 * If the array returns with 'ALUA state transition'

		 * sense code here it cannot return RTPG data during

		 * transition. So set the state to 'transitioning' directly.

		 */

		if (sense_hdr.sense_key == NOT_READY &&

		    sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x0a)

			err = SCSI_DH_RETRY;

		else if (sense_hdr.sense_key == UNIT_ATTENTION)

		    sense_hdr.asc == 0x04 && sense_hdr.ascq == 0x0a) {

			transitioning_sense = true;

			goto skip_rtpg;

		}

		/*

		 * Retry on any other UNIT ATTENTION occurred.

		 */

		if (sense_hdr.sense_key == UNIT_ATTENTION)

			err = SCSI_DH_RETRY;

		if (err == SCSI_DH_RETRY &&

		    pg->expiry != 0 && time_before(jiffies, pg->expiry)) {
@@ -666,7 +673,11 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg) 
		off = 8 + (desc[7] * 4);

	}



 skip_rtpg:

	spin_lock_irqsave(&pg->lock, flags);

	if (transitioning_sense)

		pg->state = SCSI_ACCESS_STATE_TRANSITIONING;



	sdev_printk(KERN_INFO, sdev,

		    "%s: port group %02x state %c %s supports %c%c%c%c%c%c%c\n",

		    ALUA_DH_NAME, pg->group_id, print_alua_state(pg->state),

drivers/scsi/hpsa.c

+4 −0
Original line number Diff line number Diff line
@@ -5477,6 +5477,8 @@ static int hpsa_ciss_submit(struct ctlr_info *h, 
		return SCSI_MLQUEUE_HOST_BUSY;

	}



	c->device = dev;



	enqueue_cmd_and_start_io(h, c);

	/* the cmd'll come back via intr handler in complete_scsi_command()  */

	return 0;
@@ -5548,6 +5550,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h, 
		hpsa_cmd_init(h, c->cmdindex, c);

		c->cmd_type = CMD_SCSI;

		c->scsi_cmd = cmd;

		c->device = dev;

		rc = hpsa_scsi_ioaccel_raid_map(h, c);

		if (rc < 0)     /* scsi_dma_map failed. */

			rc = SCSI_MLQUEUE_HOST_BUSY;
@@ -5555,6 +5558,7 @@ static int hpsa_ioaccel_submit(struct ctlr_info *h, 
		hpsa_cmd_init(h, c->cmdindex, c);

		c->cmd_type = CMD_SCSI;

		c->scsi_cmd = cmd;

		c->device = dev;

		rc = hpsa_scsi_ioaccel_direct_map(h, c);

		if (rc < 0)     /* scsi_dma_map failed. */

			rc = SCSI_MLQUEUE_HOST_BUSY;

drivers/scsi/lpfc/lpfc_init.c

+0 −2
Original line number Diff line number Diff line
@@ -9055,7 +9055,6 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba) 
		}

	}



#if defined(BUILD_NVME)

	/* Clear NVME stats */

	if (phba->cfg_enable_fc4_type & LPFC_ENABLE_NVME) {

		for (idx = 0; idx < phba->cfg_hdw_queue; idx++) {
@@ -9063,7 +9062,6 @@ lpfc_sli4_queue_create(struct lpfc_hba *phba) 
			       sizeof(phba->sli4_hba.hdwq[idx].nvme_cstat));

		}

	}

#endif



	/* Clear SCSI stats */

	if (phba->cfg_enable_fc4_type & LPFC_ENABLE_FCP) {

CRA Git | Maintained and supported by SUSTech CRA and CCSE