diff options
| author | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:32 +0100 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-02-26 15:38:32 +0100 |
| commit | 675d276b322b45e7bf7c616a2847bdc425745b99 (patch) | |
| tree | c61e7108034bf1230024880ec8ae46a9617077c2 /drivers/scsi/device_handler/scsi_dh_rdac.c | |
| parent | e9ddd77a31e6ba2867b9c33547f6f079d55f7a72 (diff) | |
| parent | 73beece9ca07c003e0e4f4825b12be167334d4ad (diff) | |
| download | blackbird-obmc-linux-675d276b322b45e7bf7c616a2847bdc425745b99.tar.gz blackbird-obmc-linux-675d276b322b45e7bf7c616a2847bdc425745b99.zip | |
Merge branch 'foreign/liubo/replace-lockup' into for-chris-4.6
Diffstat (limited to 'drivers/scsi/device_handler/scsi_dh_rdac.c')
| -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 361358134315..93880ed6291c 100644 --- a/drivers/scsi/device_handler/scsi_dh_rdac.c +++ b/drivers/scsi/device_handler/scsi_dh_rdac.c @@ -562,7 +562,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; @@ -612,6 +612,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; |
