From: Hannes Reinecke <hare@suse.de>
To: James Bottomley <jbottomley@parallels.com>
Cc: linux-scsi@vger.kernel.org,
Sean Stewart <sean.stewart@netapp.com>,
Martin George <marting@netapp.com>,
Hannes Reinecke <hare@suse.de>
Subject: [PATCH 15/16] scsi_dh_alua: revert commit a8e5a2d593cbfccf530c3382c2c328d2edaa7b66
Date: Fri, 20 Dec 2013 13:13:40 +0100 [thread overview]
Message-ID: <1387541621-54967-16-git-send-email-hare@suse.de> (raw)
In-Reply-To: <1387541621-54967-1-git-send-email-hare@suse.de>
Obsoleted by the next patch.
Signed-off-by: Hannes Reinecke <hare@suse.de>
---
drivers/scsi/device_handler/scsi_dh_alua.c | 22 ++++++++--------------
1 file changed, 8 insertions(+), 14 deletions(-)
diff --git a/drivers/scsi/device_handler/scsi_dh_alua.c b/drivers/scsi/device_handler/scsi_dh_alua.c
index baaae3f..e6b2565 100644
--- a/drivers/scsi/device_handler/scsi_dh_alua.c
+++ b/drivers/scsi/device_handler/scsi_dh_alua.c
@@ -678,13 +678,12 @@ static int alua_check_sense(struct scsi_device *sdev,
/*
* alua_rtpg - Evaluate REPORT TARGET GROUP STATES
* @sdev: the device to be evaluated.
- * @wait_for_transition: if nonzero, wait ALUA_FAILOVER_TIMEOUT seconds for device to exit transitioning state
*
* Evaluate the Target Port Group State.
* Returns SCSI_DH_DEV_OFFLINED if the path is
* found to be unusable.
*/
-static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int wait_for_transition)
+static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg)
{
unsigned char sense[SCSI_SENSE_BUFFERSIZE];
struct scsi_sense_hdr sense_hdr;
@@ -774,7 +773,7 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w
else
pg->transition_tmo = ALUA_FAILOVER_TIMEOUT;
- if (wait_for_transition && (orig_transition_tmo != pg->transition_tmo)) {
+ if (orig_transition_tmo != pg->transition_tmo) {
sdev_printk(KERN_INFO, sdev,
"%s: transition timeout set to %d seconds\n",
ALUA_DH_NAME, pg->transition_tmo);
@@ -812,19 +811,14 @@ static int alua_rtpg(struct scsi_device *sdev, struct alua_port_group *pg, int w
switch (pg->state) {
case TPGS_STATE_TRANSITIONING:
- if (wait_for_transition) {
- if (time_before(jiffies, expiry)) {
- /* State transition, retry */
- interval += 2000;
- msleep(interval);
- goto retry;
- }
- err = SCSI_DH_RETRY;
- } else {
- err = SCSI_DH_OK;
+ if (time_before(jiffies, expiry)) {
+ /* State transition, retry */
+ interval += 2000;
+ msleep(interval);
+ goto retry;
}
-
/* Transitioning time exceeded, set port to standby */
+ err = SCSI_DH_RETRY;
pg->state = TPGS_STATE_STANDBY;
break;
case TPGS_STATE_OFFLINE:
--
1.7.12.4
next prev parent reply other threads:[~2013-12-20 12:13 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-12-20 12:13 [PATCH 00/16] scsi_dh_alua updates Hannes Reinecke
2013-12-20 12:13 ` [PATCH 01/16] scsi_dh_alua: Improve error handling Hannes Reinecke
2013-12-20 12:13 ` [PATCH 02/16] scsi_dh_alua: use flag for RTPG extended header Hannes Reinecke
2013-12-20 12:13 ` [PATCH 03/16] scsi_dh_alua: Pass buffer as function argument Hannes Reinecke
2013-12-20 12:13 ` [PATCH 04/16] scsi_dh_alua: Make stpg synchronous Hannes Reinecke
2013-12-20 12:13 ` [PATCH 05/16] scsi_dh_alua: put sense buffer on stack Hannes Reinecke
2013-12-20 12:13 ` [PATCH 06/16] scsi_dh_alua: use local buffer for VPD inquiry Hannes Reinecke
2014-01-17 9:04 ` Mike Christie
2014-01-17 9:38 ` Hannes Reinecke
2013-12-20 12:13 ` [PATCH 07/16] scsi_dh_alua: Use separate alua_port_group structure Hannes Reinecke
2013-12-20 12:13 ` [PATCH 08/16] scsi_dh_alua: parse target device id Hannes Reinecke
2013-12-20 12:13 ` [PATCH 09/16] scsi_dh_alua: simplify sense code handling Hannes Reinecke
2013-12-20 12:13 ` [PATCH 10/16] scsi_dh_alua: Do not attach to management devices Hannes Reinecke
2013-12-20 12:13 ` [PATCH 11/16] scsi_dh_alua: multipath failover fails with error 15 Hannes Reinecke
2013-12-20 12:13 ` [PATCH 12/16] scsi_dh: return individual errors in scsi_dh_activate() Hannes Reinecke
2013-12-20 12:13 ` [PATCH 13/16] scsi_dh_alua: Clarify logging message Hannes Reinecke
2013-12-20 12:13 ` [PATCH 14/16] scsi_dh: invoke callback if ->activate is not present Hannes Reinecke
2013-12-20 12:13 ` Hannes Reinecke [this message]
2013-12-20 12:13 ` [PATCH 16/16] scsi_dh_alua: Use workqueue for RTPG Hannes Reinecke
2014-01-21 8:25 ` Vaughan Cao
-- strict thread matches above, loose matches on Subject: below --
2014-01-31 9:29 [PATCHv2 00/16] scsi_dh_alua updates Hannes Reinecke
2014-01-31 9:29 ` [PATCH 15/16] scsi_dh_alua: revert commit a8e5a2d593cbfccf530c3382c2c328d2edaa7b66 Hannes Reinecke
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=1387541621-54967-16-git-send-email-hare@suse.de \
--to=hare@suse.de \
--cc=jbottomley@parallels.com \
--cc=linux-scsi@vger.kernel.org \
--cc=marting@netapp.com \
--cc=sean.stewart@netapp.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).