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

* master.kernel.org:/pub/scm/linux/kernel/git/jejb/scsi-misc-2.6: (166 commits)
  [SCSI] ibmvscsi: convert to use the data buffer accessors
  [SCSI] dc395x: convert to use the data buffer accessors
  [SCSI] ncr53c8xx: convert to use the data buffer accessors
  [SCSI] sym53c8xx: convert to use the data buffer accessors
  [SCSI] ppa: coding police and printk levels
  [SCSI] aic7xxx_old: remove redundant GFP_ATOMIC from kmalloc
  [SCSI] i2o: remove redundant GFP_ATOMIC from kmalloc from device.c
  [SCSI] remove the dead CYBERSTORMIII_SCSI option
  [SCSI] don't build scsi_dma_{map,unmap} for !HAS_DMA
  [SCSI] Clean up scsi_add_lun a bit
  [SCSI] 53c700: Remove printk, which triggers because of low scsi clock on SNI RMs
  [SCSI] sni_53c710: Cleanup
  [SCSI] qla4xxx: Fix underrun/overrun conditions
  [SCSI] megaraid_mbox: use mutex instead of semaphore
  [SCSI] aacraid: add 51245, 51645 and 52245 adapters to documentation.
  [SCSI] qla2xxx: update version to 8.02.00-k1.
  [SCSI] qla2xxx: add support for NPIV
  [SCSI] stex: use resid for xfer len information
  [SCSI] Add Brownie 1200U3P to blacklist
  [SCSI] scsi.c: convert to use the data buffer accessors
  ...

2 files changed, 10 insertions, 17 deletions

diff --git a/drivers/s390/scsi/zfcp_aux.c b/drivers/s390/scsi/zfcp_aux.c
index 821cde65e369..a1db95925138 100644
--- a/drivers/s390/scsi/zfcp_aux.c
+++ b/drivers/s390/scsi/zfcp_aux.c
@@ -815,9 +815,7 @@ zfcp_get_adapter_by_busid(char *bus_id)
 struct zfcp_unit *
 zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
 {
-        struct zfcp_unit *unit, *tmp_unit;
-        unsigned int scsi_lun;
-        int found;
+        struct zfcp_unit *unit;
 
         /*
          * check that there is no unit with this FCP_LUN already in list
@@ -863,22 +861,10 @@ zfcp_unit_enqueue(struct zfcp_port *port, fcp_lun_t fcp_lun)
         }
 
         zfcp_unit_get(unit);
+        unit->scsi_lun = scsilun_to_int((struct scsi_lun *)&unit->fcp_lun);
 
-        scsi_lun = 0;
-        found = 0;
         write_lock_irq(&zfcp_data.config_lock);
-        list_for_each_entry(tmp_unit, &port->unit_list_head, list) {
-                if (tmp_unit->scsi_lun != scsi_lun) {
-                        found = 1;
-                        break;
-                }
-                scsi_lun++;
-        }
-        unit->scsi_lun = scsi_lun;
-        if (found)
-                list_add_tail(&unit->list, &tmp_unit->list);
-        else
-                list_add_tail(&unit->list, &port->unit_list_head);
+        list_add_tail(&unit->list, &port->unit_list_head);
         atomic_clear_mask(ZFCP_STATUS_COMMON_REMOVE, &unit->status);
         atomic_set_mask(ZFCP_STATUS_COMMON_RUNNING, &unit->status);
         write_unlock_irq(&zfcp_data.config_lock);
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c
index aef66bc2b6ca..4e7cb6dc4d34 100644
--- a/drivers/s390/scsi/zfcp_erp.c
+++ b/drivers/s390/scsi/zfcp_erp.c
@@ -1986,6 +1986,10 @@ zfcp_erp_adapter_strategy_generic(struct zfcp_erp_action *erp_action, int close)
  failed_openfcp:
         zfcp_close_fsf(erp_action->adapter);
  failed_qdio:
+        atomic_clear_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK |
+                          ZFCP_STATUS_ADAPTER_LINK_UNPLUGGED |
+                          ZFCP_STATUS_ADAPTER_XPORT_OK,
+                          &erp_action->adapter->status);
  out:
         return retval;
 }
@@ -2167,6 +2171,9 @@ zfcp_erp_adapter_strategy_open_fsf_xconfig(struct zfcp_erp_action *erp_action)
                 sleep *= 2;
         }
 
+        atomic_clear_mask(ZFCP_STATUS_ADAPTER_HOST_CON_INIT,
+                          &adapter->status);
+
         if (!atomic_test_mask(ZFCP_STATUS_ADAPTER_XCONFIG_OK,
                               &adapter->status)) {
                 ZFCP_LOG_INFO("error: exchange of configuration data for "