linux-next: manual merge of the target-updates tree with the scsi tree

[Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx>]

Hi Nicholas,

Today's linux-next merge of the target-updates tree got a conflict in
drivers/scsi/qla2xxx/qla_target.c between commit 33e799775593
("qla2xxx: Add support for QFull throttling and Term Exchange retry")
from the scsi tree and commit 55a9066fffd2 ("qla_target: make some
global functions static") from the target-updates tree.

I fixed it up (see below) and can carry the fix as necessary (no action
is required).

-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx

diff --cc drivers/scsi/qla2xxx/qla_target.c
index 829752cfd73f,68c90ad441f4..000000000000
--- a/drivers/scsi/qla2xxx/qla_target.c
+++ b/drivers/scsi/qla2xxx/qla_target.c
@@@ -108,10 -101,7 +108,11 @@@ static void qlt_send_term_exchange(stru
  	*cmd, struct atio_from_isp *atio, int ha_locked);
  static void qlt_reject_free_srr_imm(struct scsi_qla_host *ha,
  	struct qla_tgt_srr_imm *imm, int ha_lock);
 +static void qlt_abort_cmd_on_host_reset(struct scsi_qla_host *vha,
 +	struct qla_tgt_cmd *cmd);
 +static void qlt_alloc_qfull_cmd(struct scsi_qla_host *vha,
 +	struct atio_from_isp *atio, uint16_t status, int qfull);
+ static void qlt_disable_vha(struct scsi_qla_host *vha);
  /*
   * Global Variables
   */
@@@ -189,28 -179,7 +190,28 @@@ struct scsi_qla_host *qlt_find_host_by_
  	return NULL;
  }
  
 +static inline void qlt_incr_num_pend_cmds(struct scsi_qla_host *vha)
 +{
 +	unsigned long flags;
 +
 +	spin_lock_irqsave(&vha->hw->tgt.q_full_lock, flags);
 +
 +	vha->hw->tgt.num_pend_cmds++;
 +	if (vha->hw->tgt.num_pend_cmds > vha->hw->qla_stats.stat_max_pend_cmds)
 +		vha->hw->qla_stats.stat_max_pend_cmds =
 +			vha->hw->tgt.num_pend_cmds;
 +	spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags);
 +}
 +static inline void qlt_decr_num_pend_cmds(struct scsi_qla_host *vha)
 +{
 +	unsigned long flags;
 +
 +	spin_lock_irqsave(&vha->hw->tgt.q_full_lock, flags);
 +	vha->hw->tgt.num_pend_cmds--;
 +	spin_unlock_irqrestore(&vha->hw->tgt.q_full_lock, flags);
 +}
 +
- void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
+ static void qlt_24xx_atio_pkt_all_vps(struct scsi_qla_host *vha,
  	struct atio_from_isp *atio)
  {
  	ql_dbg(ql_dbg_tgt, vha, 0xe072,
@@@ -3085,10 -2924,8 +3084,9 @@@ static void qlt_do_ctio_completion(stru
  
  	se_cmd = &cmd->se_cmd;
  	tfo = se_cmd->se_tfo;
 +	cmd->cmd_sent_to_fw = 0;
  
- 	if (cmd->sg_mapped)
- 		qlt_unmap_sg(vha, cmd);
+ 	qlt_unmap_sg(vha, cmd);
  
  	if (unlikely(status != CTIO_SUCCESS)) {
  		switch (status & 0xFFFF) {

Attachment: signature.asc
Description: PGP signature