1 files changed, 9 insertions, 6 deletions

diff --git a/drivers/scsi/qla4xxx/ql4_os.c b/drivers/scsi/qla4xxx/ql4_os.c
index bb160409b7cb..9be829bb90db 100644
--- a/drivers/scsi/qla4xxx/ql4_os.c
+++ b/drivers/scsi/qla4xxx/ql4_os.c
@@ -4565,6 +4565,7 @@ static void qla4xxx_timer(struct scsi_qla_host *ha)
              test_bit(DPC_LINK_CHANGED, &ha->dpc_flags) ||
              test_bit(DPC_HA_UNRECOVERABLE, &ha->dpc_flags) ||
              test_bit(DPC_HA_NEED_QUIESCENT, &ha->dpc_flags) ||
+             test_bit(DPC_SYSFS_DDB_EXPORT, &ha->dpc_flags) ||
              test_bit(DPC_AEN, &ha->dpc_flags)) {
                 DEBUG2(printk("scsi%ld: %s: scheduling dpc routine"
                               " - dpc flags = 0x%lx\n",
@@ -5429,6 +5430,11 @@ dpc_post_reset_ha:
                                 qla4xxx_relogin_all_devices(ha);
                 }
         }
+        if (test_and_clear_bit(DPC_SYSFS_DDB_EXPORT, &ha->dpc_flags)) {
+                if (qla4xxx_sysfs_ddb_export(ha))
+                        ql4_printk(KERN_ERR, ha, "%s: Error exporting ddb to sysfs\n",
+                                   __func__);
+        }
 }
 
 /**
@@ -8406,7 +8412,7 @@ exit_ddb_del:
  *
  * Export the firmware DDB for all send targets and normal targets to sysfs.
  **/
-static int qla4xxx_sysfs_ddb_export(struct scsi_qla_host *ha)
+int qla4xxx_sysfs_ddb_export(struct scsi_qla_host *ha)
 {
         struct dev_db_entry *fw_ddb_entry = NULL;
         dma_addr_t fw_ddb_entry_dma;
@@ -8844,11 +8850,8 @@ skip_retry_init:
                 ql4_printk(KERN_ERR, ha,
                            "%s: No iSCSI boot target configured\n", __func__);
 
-        if (qla4xxx_sysfs_ddb_export(ha))
-                ql4_printk(KERN_ERR, ha,
-                           "%s: Error exporting ddb to sysfs\n", __func__);
-
-                /* Perform the build ddb list and login to each */
+        set_bit(DPC_SYSFS_DDB_EXPORT, &ha->dpc_flags);
+        /* Perform the build ddb list and login to each */
         qla4xxx_build_ddb_list(ha, INIT_ADAPTER);
         iscsi_host_for_each_session(ha->host, qla4xxx_login_flash_ddb);
         qla4xxx_wait_login_resp_boot_tgt(ha);