From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 2 Sep 2015 19:22:54 +0000 (-0700)
Subject: Merge tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi
X-Git-Tag: v4.3-rc1~101
X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-linux.git;a=commitdiff_plain;h=df910390e2db07a76c87f258475f6c96253cee6c

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

Pull first round of SCSI updates from James Bottomley:
 "This includes one new driver: cxlflash plus the usual grab bag of
  updates for the major drivers: qla2xxx, ipr, storvsc, pm80xx, hptiop,
  plus a few assorted fixes.

  There's another tranch coming, but I want to incubate it another few
  days in the checkers, plus it includes a mpt2sas separated lifetime
  fix, which Avago won't get done testing until Friday"

* tag 'scsi-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi: (85 commits)
  aic94xx: set an error code on failure
  storvsc: Set the error code correctly in failure conditions
  storvsc: Allow write_same when host is windows 10
  storvsc: use storage protocol version to determine storage capabilities
  storvsc: use correct defaults for values determined by protocol negotiation
  storvsc: Untangle the storage protocol negotiation from the vmbus protocol negotiation.
  storvsc: Use a single value to track protocol versions
  storvsc: Rather than look for sets of specific protocol versions, make decisions based on ranges.
  cxlflash: Remove unused variable from queuecommand
  cxlflash: shift wrapping bug in afu_link_reset()
  cxlflash: off by one bug in cxlflash_show_port_status()
  cxlflash: Virtual LUN support
  cxlflash: Superpipe support
  cxlflash: Base error recovery support
  qla2xxx: Update driver version to 8.07.00.26-k
  qla2xxx: Add pci device id 0x2261.
  qla2xxx: Fix missing device login retries.
  qla2xxx: do not clear slot in outstanding cmd array
  qla2xxx: Remove decrement of sp reference count in abort handler.
  qla2xxx: Add support to show MPI and PEP FW version for ISP27xx.
  ...
---

df910390e2db07a76c87f258475f6c96253cee6c
diff --cc drivers/scsi/qla2xxx/qla_target.c
index 58651ecbd88c,6b7736d02534..75514a15bea0
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@@ -2681,13 -2480,10 +2676,13 @@@ int qlt_rdy_to_xfer(struct qla_tgt_cmd 
  	else
  		res = qlt_24xx_build_ctio_pkt(&prm, vha);
  
 -	if (unlikely(res != 0))
 +	if (unlikely(res != 0)) {
 +		vha->req->cnt += prm.req_cnt;
  		goto out_unlock_free_unmap;
 +	}
 +
  	pkt = (struct ctio7_to_24xx *)prm.pkt;
- 	pkt->u.status0.flags |= __constant_cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
+ 	pkt->u.status0.flags |= cpu_to_le16(CTIO7_FLAGS_DATA_OUT |
  	    CTIO7_FLAGS_STATUS_MODE_0);
  
  	if (cmd->se_cmd.prot_op == TARGET_PROT_NORMAL)
@@@ -3478,15 -3169,11 +3470,11 @@@ static void qlt_do_ctio_completion(stru
  skip_term:
  
  	if (cmd->state == QLA_TGT_STATE_PROCESSED) {
 -		;
 +		cmd->cmd_flags |= BIT_12;
  	} else if (cmd->state == QLA_TGT_STATE_NEED_DATA) {
- 		int rx_status = 0;
- 
  		cmd->state = QLA_TGT_STATE_DATA_IN;
  
- 		if (unlikely(status != CTIO_SUCCESS))
- 			rx_status = -EIO;
- 		else
+ 		if (status == CTIO_SUCCESS)
  			cmd->write_data_transferred = 1;
  
  		ha->tgt.tgt_ops->handle_data(cmd);