Commit f0d98d85 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 a set of minor (and safe changes) that didn't make the initial
  pull request plus some bug fixes.

  The status handling code is actually a running regression from the
  previous merge window which had an incomplete fix (now reverted) and
  most of the remaining bug fixes are for problems older than the
  current merge window"

[ Side note: this merge also takes the base kernel git repository to 6+
  million objects for the first time. Technically we hit it a couple of
  merges ago already if you count all the tag objects, but now it
  reaches 6M+ objects reachable from HEAD.

  I was joking around that that's when I should switch to 5.0, because
  3.0 happened at the 2M mark, and 4.0 happened at 4M objects. But
  probably not, even if numerology is about as good a reason as any.

                                                              - Linus ]

* tag 'scsi-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi:
  scsi: devinfo: Add Microsoft iSCSI target to 1024 sector blacklist
  scsi: cxgb4i: silence overflow warning in t4_uld_rx_handler()
  scsi: dpt_i2o: Use after free in I2ORESETCMD ioctl
  scsi: core: Make scsi_result_to_blk_status() recognize CONDITION MET
  scsi: core: Rename __scsi_error_from_host_byte() into scsi_result_to_blk_status()
  Revert "scsi: core: return BLK_STS_OK for DID_OK in __scsi_error_from_host_byte()"
  scsi: aacraid: Insure command thread is not recursively stopped
  scsi: qla2xxx: Correct setting of SAM_STAT_CHECK_CONDITION
  scsi: qla2xxx: correctly shift host byte
  scsi: qla2xxx: Fix race condition between iocb timeout and initialisation
  scsi: qla2xxx: Avoid double completion of abort command
  scsi: qla2xxx: Fix small memory leak in qla2x00_probe_one on probe failure
  scsi: scsi_dh: Don't look for NULL devices handlers by name
  scsi: core: remove redundant assignment to shost->use_blk_mq
parents ca71b3ba 4d426803

drivers/scsi/aacraid/commsup.c

+3 −1
Original line number Diff line number Diff line
@@ -1502,9 +1502,10 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
	host = aac->scsi_host_ptr;

	scsi_block_requests(host);

	aac_adapter_disable_int(aac);

	if (aac->thread->pid != current->pid) {

	if (aac->thread && aac->thread->pid != current->pid) {

		spin_unlock_irq(host->host_lock);

		kthread_stop(aac->thread);

		aac->thread = NULL;

		jafo = 1;

	}
@@ -1591,6 +1592,7 @@ static int _aac_reset_adapter(struct aac_dev *aac, int forced, u8 reset_type) 
					  aac->name);

		if (IS_ERR(aac->thread)) {

			retval = PTR_ERR(aac->thread);

			aac->thread = NULL;

			goto out;

		}

	}

drivers/scsi/aacraid/linit.c

+1 −0
Original line number Diff line number Diff line
@@ -1562,6 +1562,7 @@ static void __aac_shutdown(struct aac_dev * aac) 
				up(&fib->event_wait);

		}

		kthread_stop(aac->thread);

		aac->thread = NULL;

	}



	aac_send_shutdown(aac);

drivers/scsi/cxgbi/cxgb4i/cxgb4i.c

+4 −4
Original line number Diff line number Diff line
@@ -2108,12 +2108,12 @@ static int t4_uld_rx_handler(void *handle, const __be64 *rsp, 
	log_debug(1 << CXGBI_DBG_TOE,

		"cdev %p, opcode 0x%x(0x%x,0x%x), skb %p.\n",

		 cdev, opc, rpl->ot.opcode_tid, ntohl(rpl->ot.opcode_tid), skb);

	if (cxgb4i_cplhandlers[opc])

		cxgb4i_cplhandlers[opc](cdev, skb);

	else {

	if (opc >= ARRAY_SIZE(cxgb4i_cplhandlers) || !cxgb4i_cplhandlers[opc]) {

		pr_err("No handler for opcode 0x%x.\n", opc);

		__kfree_skb(skb);

	}

	} else

		cxgb4i_cplhandlers[opc](cdev, skb);



	return 0;

nomem:

	log_debug(1 << CXGBI_DBG_TOE, "OOM bailing out.\n");

drivers/scsi/dpt_i2o.c

+8 −5
Original line number Diff line number Diff line
@@ -2051,13 +2051,16 @@ static int adpt_ioctl(struct inode *inode, struct file *file, uint cmd, ulong ar 
		}

		break;

		}

	case I2ORESETCMD:

		if(pHba->host)

			spin_lock_irqsave(pHba->host->host_lock, flags);

	case I2ORESETCMD: {

		struct Scsi_Host *shost = pHba->host;



		if (shost)

			spin_lock_irqsave(shost->host_lock, flags);

		adpt_hba_reset(pHba);

		if(pHba->host)

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

		if (shost)

			spin_unlock_irqrestore(shost->host_lock, flags);

		break;

	}

	case I2ORESCANCMD:

		adpt_rescan(pHba);

		break;

drivers/scsi/hosts.c

+0 −1
Original line number Diff line number Diff line
@@ -472,7 +472,6 @@ struct Scsi_Host *scsi_host_alloc(struct scsi_host_template *sht, int privsize) 
	else

		shost->dma_boundary = 0xffffffff;



	shost->use_blk_mq = scsi_use_blk_mq;

	shost->use_blk_mq = scsi_use_blk_mq || shost->hostt->force_blk_mq;



	device_initialize(&shost->shost_gendev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE