From: vikas.chaudhary@qlogic.com
To: James.Bottomley@suse.de
Cc: linux-scsi@vger.kernel.org, ravi.anand@qlogic.com,
lalit.chandivade@qlogic.com, vikas.chaudhary@qlogic.com
Subject: [PATCH 07/13] qla4xxx: cleanup function qla4xxx_process_ddb_changed
Date: Mon, 21 Mar 2011 03:34:30 -0700 [thread overview]
Message-ID: <1300703676-27398-7-git-send-email-vikas.chaudhary@qlogic.com> (raw)
In-Reply-To: <1300703676-27398-1-git-send-email-vikas.chaudhary@qlogic.com>
From: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
We don't need to check ddb old state we can take action
based on ddb new state.
Signed-off-by: Vikas Chaudhary <vikas.chaudhary@qlogic.com>
---
drivers/scsi/qla4xxx/ql4_init.c | 15 +++------------
1 files changed, 3 insertions(+), 12 deletions(-)
diff --git a/drivers/scsi/qla4xxx/ql4_init.c b/drivers/scsi/qla4xxx/ql4_init.c
index 8b5453a..bbb2e90 100644
--- a/drivers/scsi/qla4xxx/ql4_init.c
+++ b/drivers/scsi/qla4xxx/ql4_init.c
@@ -1409,7 +1409,6 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
uint32_t state, uint32_t conn_err)
{
struct ddb_entry * ddb_entry;
- uint32_t old_fw_ddb_device_state;
/* check for out of range index */
if (fw_ddb_index >= MAX_DDB_ENTRIES)
@@ -1425,22 +1424,14 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
}
/* Device already exists in our database. */
- old_fw_ddb_device_state = ddb_entry->fw_ddb_device_state;
DEBUG2(printk("scsi%ld: %s DDB - old state= 0x%x, new state=0x%x for "
"index [%d]\n", ha->host_no, __func__,
ddb_entry->fw_ddb_device_state, state, fw_ddb_index));
- if (old_fw_ddb_device_state == state &&
- state == DDB_DS_SESSION_ACTIVE) {
- if (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE) {
- atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
- iscsi_unblock_session(ddb_entry->sess);
- }
- return QLA_SUCCESS;
- }
ddb_entry->fw_ddb_device_state = state;
/* Device is back online. */
- if (ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) {
+ if ((ddb_entry->fw_ddb_device_state == DDB_DS_SESSION_ACTIVE) &&
+ (atomic_read(&ddb_entry->state) != DDB_STATE_ONLINE)) {
atomic_set(&ddb_entry->state, DDB_STATE_ONLINE);
atomic_set(&ddb_entry->relogin_retry_count, 0);
atomic_set(&ddb_entry->relogin_timer, 0);
@@ -1452,7 +1443,7 @@ int qla4xxx_process_ddb_changed(struct scsi_qla_host *ha, uint32_t fw_ddb_index,
* Change the lun state to READY in case the lun TIMEOUT before
* the device came back.
*/
- } else {
+ } else if (ddb_entry->fw_ddb_device_state != DDB_DS_SESSION_ACTIVE) {
/* Device went away, mark device missing */
if (atomic_read(&ddb_entry->state) == DDB_STATE_ONLINE) {
DEBUG2(ql4_printk(KERN_INFO, ha, "%s mark missing "
--
1.7.3.2
next prev parent reply other threads:[~2011-03-21 10:46 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-21 10:34 [PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list() vikas.chaudhary
2011-03-21 10:34 ` [PATCH 02/13] qla4xxx: Do not send mbox command if FW is in failed state vikas.chaudhary
2011-03-21 10:34 ` [PATCH 03/13] qla4xxx: Do not retry ISP82XX initialization if H/W state is failed vikas.chaudhary
2011-03-21 10:34 ` [PATCH 04/13] qla4xxx: cleanup DDB relogin logic during initialization vikas.chaudhary
2011-03-21 10:34 ` [PATCH 05/13] qla4xxx: remove unused ddb flag DF_NO_RELOGIN vikas.chaudhary
2011-03-21 10:34 ` [PATCH 06/13] qla4xxx: Prevent other port reinitialization during remove_adapter vikas.chaudhary
2011-03-21 10:34 ` vikas.chaudhary [this message]
2011-03-21 10:34 ` [PATCH 08/13] qla4xxx: Add support for ql4xmaxqdepth command line parameter vikas.chaudhary
2011-03-21 10:34 ` [PATCH 09/13] qla4xxx: add support for ql4xsess_recovery_tmo cmd line param vikas.chaudhary
2011-03-21 10:34 ` [PATCH 10/13] qla4xxx: added new function qla4xxx_relogin_all_devices vikas.chaudhary
2011-03-21 10:34 ` [PATCH 12/13] qla4xxx: masking required bits of add_fw_options during initialization vikas.chaudhary
2011-03-21 10:34 ` [PATCH 13/13] qla4xxx: Update driver version to 5.02.00-k6 vikas.chaudhary
2011-03-23 14:44 ` [PATCH 01/13] qla4xxx: cleanup qla4xxx_initialize_ddb_list() James Bottomley
2011-03-23 15:10 ` Vikas Chaudhary
-- strict thread matches above, loose matches on Subject: below --
2011-03-14 5:24 [PATCH 07/13] qla4xxx: cleanup function qla4xxx_process_ddb_changed Vikas Chaudhary
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1300703676-27398-7-git-send-email-vikas.chaudhary@qlogic.com \
--to=vikas.chaudhary@qlogic.com \
--cc=James.Bottomley@suse.de \
--cc=lalit.chandivade@qlogic.com \
--cc=linux-scsi@vger.kernel.org \
--cc=ravi.anand@qlogic.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).