diff options
| author | adam radford <aradford@gmail.com> | 2014-03-10 02:51:28 -0700 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2014-03-15 10:19:20 -0700 |
| commit | 26a077e7a6b471926da3a70b7fb212758463f589 (patch) | |
| tree | 9e1e45503180e6dfccb819bd6f4bf08877872779 /drivers/scsi/megaraid/megaraid_sas_fp.c | |
| parent | 8058a1691b6d679e6ea129e626cfa44c8f5acd6d (diff) | |
| download | op-kernel-dev-26a077e7a6b471926da3a70b7fb212758463f589.zip op-kernel-dev-26a077e7a6b471926da3a70b7fb212758463f589.tar.gz | |
[SCSI] megaraid_sas: Load correct raid context timeout
The following patch for megaraid_sas loads the correct raid context timeout
value for multpathing and clustering.
Signed-off-by: Adam Radford <aradford@gmail.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/megaraid/megaraid_sas_fp.c')
| -rw-r--r-- | drivers/scsi/megaraid/megaraid_sas_fp.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fp.c b/drivers/scsi/megaraid/megaraid_sas_fp.c index 2f3bd55..081bfff 100644 --- a/drivers/scsi/megaraid/megaraid_sas_fp.c +++ b/drivers/scsi/megaraid/megaraid_sas_fp.c @@ -975,7 +975,10 @@ MR_BuildRaidContext(struct megasas_instance *instance, regSize += stripSize; } - pRAID_Context->timeoutValue = cpu_to_le16(map->raidMap.fpPdIoTimeoutSec); + pRAID_Context->timeoutValue = + cpu_to_le16(raid->fpIoTimeoutForLd ? + raid->fpIoTimeoutForLd : + map->raidMap.fpPdIoTimeoutSec); if ((instance->pdev->device == PCI_DEVICE_ID_LSI_INVADER) || (instance->pdev->device == PCI_DEVICE_ID_LSI_FURY)) pRAID_Context->regLockFlags = (isRead) ? |
