diff options
| author | Hannes Reinecke <hare@suse.de> | 2016-01-22 15:42:41 +0100 |
|---|---|---|
| committer | Sasha Levin <sasha.levin@oracle.com> | 2016-03-02 15:18:57 -0500 |
| commit | 967671466a7f23d5a083190acbe5f94bd2ca7e6c (patch) | |
| tree | 363f48f6a98c3ee75f7abdebcc4e4563a2136ee5 | |
| parent | fb87262aec0685ef7fe89ae50a5ee900d48db4d4 (diff) | |
| download | lwn-967671466a7f23d5a083190acbe5f94bd2ca7e6c.tar.gz lwn-967671466a7f23d5a083190acbe5f94bd2ca7e6c.zip | |
scsi_dh_rdac: always retry MODE SELECT on command lock violation
[ Upstream commit d2d06d4fe0f2cc2df9b17fefec96e6e1a1271d91 ]
If MODE SELECT returns with sense '05/91/36' (command lock violation)
it should always be retried without counting the number of retries.
During an HBA upgrade or similar circumstances one might see a flood
of MODE SELECT command from various HBAs, which will easily trigger
the sense code and exceed the retry count.
Cc: <stable@vger.kernel.org>
Signed-off-by: Hannes Reinecke <hare@suse.de>
Reviewed-by: Johannes Thumshirn <jthumshirn@suse.de>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
| -rw-r--r-- | drivers/scsi/device_handler/scsi_dh_rdac.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/drivers/scsi/device_handler/scsi_dh_rdac.c b/drivers/scsi/device_handler/scsi_dh_rdac.c index 1b5bc9293e37..cd4042a22a56 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c @@ -569,7 +569,7 @@ static int mode_select_handle_sense(struct scsi_device *sdev, /* * Command Lock contention */ - err = SCSI_DH_RETRY; + err = SCSI_DH_IMM_RETRY; break; default: break; @@ -619,6 +619,8 @@ retry: err = mode_select_handle_sense(sdev, h->sense); if (err == SCSI_DH_RETRY && retry_cnt--) goto retry; + if (err == SCSI_DH_IMM_RETRY) + goto retry; } if (err == SCSI_DH_OK) { h->state = RDAC_STATE_ACTIVE; |