openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

isci: fix remote_device start_io regressions 

While reducing indentation commits 7ab92c9e "isci: make a
remote_node_context a proper member of a remote_device", 0879e6a6 "isci:
merge remote_device substates into a single state machine" broke
handling of situations where i/o's successfully started at the port
level need to terminated when the remote_node declines to start the i/o.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
This commit is contained in:
Dan Williams 2011-05-01 10:13:04 -07:00
parent 8f304c36ee
commit f619fffb40
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/scsi/isci/remote_device.c
View File

@ -1157,10 +1157,8 @@ static enum sci_status scic_sds_stp_remote_device_ready_ncq_substate_start_io_ha
return status;
status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, request);
if (status != SCI_SUCCESS)
return status;
status = request->state_handlers->start_handler(request);
if (status == SCI_SUCCESS)
status = request->state_handlers->start_handler(request);
scic_sds_remote_device_start_request(sci_dev, request, status);
} else
@ -1302,16 +1300,17 @@ static enum sci_status scic_sds_smp_remote_device_ready_idle_substate_start_io_h
status = scic_sds_remote_node_context_start_io(&sci_dev->rnc, sci_req);
if (status != SCI_SUCCESS)
return status;
goto out;
status = scic_sds_request_start(sci_req);
if (status != SCI_SUCCESS)
return status;
goto out;
sci_dev->working_request = sci_req;
sci_base_state_machine_change_state(&sci_dev->state_machine,
SCIC_SDS_SMP_REMOTE_DEVICE_READY_SUBSTATE_CMD);
out:
scic_sds_remote_device_start_request(sci_dev, sci_req, status);
return status;