aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/scsi/megaraid
diff options
context:
space:
mode:
authoradam radford <aradford@gmail.com>2013-02-09 18:29:20 -0500
committerJames Bottomley <JBottomley@Parallels.com>2013-02-22 10:31:41 -0500
commit9c5ebd09e5092fdeffd079efd2b40afaa69dafb7 (patch)
tree3bf2846b289b223795421cd5d478771725c9228e /drivers/scsi/megaraid
parent046c9ec259d271e7988c7fbe80b8bddf3c8efdc4 (diff)
[SCSI] megaraid_sas: Dont load DevHandle unless FastPath enabled
The following patch for megaraid_sas will fix an issue where the driver should not be loading the DevHandle unless FastPath is enabled. If FastPath was not enabled, this means the hardware raid map validation failed for some reason, or the map was corrupted, which could mean the DevHandle could be invalid. Signed-off-by: Adam Radford <aradford@gmail.com> Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/megaraid')
-rw-r--r--drivers/scsi/megaraid/megaraid_sas_fusion.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/megaraid/megaraid_sas_fusion.c b/drivers/scsi/megaraid/megaraid_sas_fusion.c
index a6bccf097fc6..a7d56687bfca 100644
--- a/drivers/scsi/megaraid/megaraid_sas_fusion.c
+++ b/drivers/scsi/megaraid/megaraid_sas_fusion.c
@@ -1511,7 +1511,8 @@ megasas_build_dcdb_fusion(struct megasas_instance *instance,
1511 if (scmd->device->channel < MEGASAS_MAX_PD_CHANNELS && 1511 if (scmd->device->channel < MEGASAS_MAX_PD_CHANNELS &&
1512 instance->pd_list[pd_index].driveState == MR_PD_STATE_SYSTEM) { 1512 instance->pd_list[pd_index].driveState == MR_PD_STATE_SYSTEM) {
1513 io_request->Function = 0; 1513 io_request->Function = 0;
1514 io_request->DevHandle = 1514 if (fusion->fast_path_io)
1515 io_request->DevHandle =
1515 local_map_ptr->raidMap.devHndlInfo[device_id].curDevHdl; 1516 local_map_ptr->raidMap.devHndlInfo[device_id].curDevHdl;
1516 io_request->RaidContext.timeoutValue = 1517 io_request->RaidContext.timeoutValue =
1517 local_map_ptr->raidMap.fpPdIoTimeoutSec; 1518 local_map_ptr->raidMap.fpPdIoTimeoutSec;