diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2012-03-14 04:15:11 +0400 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-18 01:33:44 +0400 |
| commit | de2eb4d5c5c25e8fb75d1e19092f24b83cb7d8d5 (patch) | |
| tree | 537fae73fbf34d34b5e83151a467275986ffb6b5 /drivers/scsi/isci/remote_node_context.h | |
| parent | 6c6aacbb7787dccc6fb662bae66e599bbf0f07b5 (diff) | |
| download | linux-de2eb4d5c5c25e8fb75d1e19092f24b83cb7d8d5.tar.xz | |
isci: End the RNC resumption wait when the RNC is destroyed.
While the RNC is suspended for I/O cleanup, the remote device can be
stopped and the RNC setup for destruction. These changes accomodate that
case in the abort path.
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/remote_node_context.h')
| -rw-r--r-- | drivers/scsi/isci/remote_node_context.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/drivers/scsi/isci/remote_node_context.h b/drivers/scsi/isci/remote_node_context.h index 0d4a24d647b4..a703b9ce0c2c 100644 --- a/drivers/scsi/isci/remote_node_context.h +++ b/drivers/scsi/isci/remote_node_context.h @@ -229,8 +229,8 @@ int sci_remote_node_context_is_safe_to_abort( static inline bool sci_remote_node_context_is_being_destroyed( struct sci_remote_node_context *sci_rnc) { - return ((sci_rnc->sm.current_state_id == SCI_RNC_INVALIDATING) - && (sci_rnc->destination_state == RNC_DEST_FINAL)) - || (sci_rnc->sm.current_state_id == SCI_RNC_INITIAL); + return (sci_rnc->destination_state == RNC_DEST_FINAL) + || ((sci_rnc->sm.current_state_id == SCI_RNC_INITIAL) + && (sci_rnc->destination_state == RNC_DEST_UNSPECIFIED)); } #endif /* _SCIC_SDS_REMOTE_NODE_CONTEXT_H_ */ |