Merge git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6

* git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (137 commits)
  [SCSI] iscsi: bidi support for iscsi_tcp
  [SCSI] iscsi: bidi support at the generic libiscsi level
  [SCSI] iscsi: extended cdb support
  [SCSI] zfcp: Fix error handling for blocked unit for send FCP command
  [SCSI] zfcp: Remove zfcp_erp_wait from slave destory handler to fix deadlock
  [SCSI] zfcp: fix 31 bit compile warnings
  [SCSI] bsg: no need to set BSG_F_BLOCK bit in bsg_complete_all_commands
  [SCSI] bsg: remove minor in struct bsg_device
  [SCSI] bsg: use better helper list functions
  [SCSI] bsg: replace kobject_get with blk_get_queue
  [SCSI] bsg: takes a ref to struct device in fops->open
  [SCSI] qla1280: remove version check
  [SCSI] libsas: fix endianness bug in sas_ata
  [SCSI] zfcp: fix compiler warning caused by poking inside new semaphore (linux-next)
  [SCSI] aacraid: Do not describe check_reset parameter with its value
  [SCSI] aacraid: Fix down_interruptible() to check the return value
  [SCSI] sun3_scsi_vme: add MODULE_LICENSE
  [SCSI] st: rename flush_write_buffer()
  [SCSI] tgt: use KMEM_CACHE macro
  [SCSI] initio: fix big endian problems for auto request sense
  ...

1 files changed, 16 insertions, 32 deletions

diff --git a/drivers/scsi/lpfc/lpfc_ct.c b/drivers/scsi/lpfc/lpfc_ct.c
index 3d0ccd9b341d..153afae567b5 100644
--- a/drivers/scsi/lpfc/lpfc_ct.c
+++ b/drivers/scsi/lpfc/lpfc_ct.c
@@ -63,7 +63,7 @@ lpfc_ct_ignore_hbq_buffer(struct lpfc_hba *phba, struct lpfc_iocbq *piocbq,
 {
         if (!mp) {
                 lpfc_printf_log(phba, KERN_INFO, LOG_ELS,
-                                "0146 Ignoring unsolicted CT No HBQ "
+                                "0146 Ignoring unsolicited CT No HBQ "
                                 "status = x%x\n",
                                 piocbq->iocb.ulpStatus);
         }
@@ -438,7 +438,7 @@ lpfc_ns_rsp(struct lpfc_vport *vport, struct lpfc_dmabuf *mp, uint32_t Size)
                                     (!(vport->ct_flags & FC_CT_RFF_ID)) ||
                                     (!vport->cfg_restrict_login)) {
                                         ndlp = lpfc_setup_disc_node(vport, Did);
-                                        if (ndlp) {
+                                        if (ndlp && NLP_CHK_NODE_ACT(ndlp)) {
                                                 lpfc_debugfs_disc_trc(vport,
                                                 LPFC_DISC_TRC_CT,
                                                 "Parse GID_FTrsp: "
@@ -543,7 +543,7 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         struct lpfc_dmabuf *outp;
         struct lpfc_sli_ct_request *CTrsp;
         struct lpfc_nodelist *ndlp;
-        int rc, retry;
+        int rc;
 
         /* First save ndlp, before we overwrite it */
         ndlp = cmdiocb->context_un.ndlp;
@@ -563,45 +563,29 @@ lpfc_cmpl_ct_cmd_gid_ft(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
         if (vport->load_flag & FC_UNLOADING)
                 goto out;
 
-        if (lpfc_els_chk_latt(vport) || lpfc_error_lost_link(irsp)) {
+        if (lpfc_els_chk_latt(vport)) {
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                                  "0216 Link event during NS query\n");
                 lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                 goto out;
         }
-
+        if (lpfc_error_lost_link(irsp)) {
+                lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
+                                 "0226 NS query failed due to link event\n");
+                goto out;
+        }
         if (irsp->ulpStatus) {
                 /* Check for retry */
                 if (vport->fc_ns_retry < LPFC_MAX_NS_RETRY) {
-                        retry = 1;
-                        if (irsp->ulpStatus == IOSTAT_LOCAL_REJECT) {
-                                switch (irsp->un.ulpWord[4]) {
-                                case IOERR_NO_RESOURCES:
-                                        /* We don't increment the retry
-                                         * count for this case.
-                                         */
-                                        break;
-                                case IOERR_LINK_DOWN:
-                                case IOERR_SLI_ABORTED:
-                                case IOERR_SLI_DOWN:
-                                        retry = 0;
-                                        break;
-                                default:
-                                        vport->fc_ns_retry++;
-                                }
-                        }
-                        else
+                        if (irsp->ulpStatus != IOSTAT_LOCAL_REJECT ||
+                            irsp->un.ulpWord[4] != IOERR_NO_RESOURCES)
                                 vport->fc_ns_retry++;
 
-                        if (retry) {
-                                /* CT command is being retried */
-                                rc = lpfc_ns_cmd(vport, SLI_CTNS_GID_FT,
+                        /* CT command is being retried */
+                        rc = lpfc_ns_cmd(vport, SLI_CTNS_GID_FT,
                                          vport->fc_ns_retry, 0);
-                                if (rc == 0) {
-                                        /* success */
-                                        goto out;
-                                }
-                        }
+                        if (rc == 0)
+                                goto out;
                 }
                 lpfc_vport_set_state(vport, FC_VPORT_FAILED);
                 lpfc_printf_vlog(vport, KERN_ERR, LOG_ELS,
@@ -780,7 +764,7 @@ lpfc_cmpl_ct_cmd_gff_id(struct lpfc_hba *phba, struct lpfc_iocbq *cmdiocb,
 
         /* This is a target port, unregistered port, or the GFF_ID failed */
         ndlp = lpfc_setup_disc_node(vport, did);
-        if (ndlp) {
+        if (ndlp && NLP_CHK_NODE_ACT(ndlp)) {
                 lpfc_printf_vlog(vport, KERN_INFO, LOG_DISCOVERY,
                                  "0242 Process x%x GFF "
                                  "NameServer Rsp Data: x%x x%x x%x\n",