diff options
author | Andreas Herrmann <aherrman@de.ibm.com> | 2006-09-18 16:30:36 -0400 |
---|---|---|
committer | James Bottomley <jejb@mulgrave.il.steeleye.com> | 2006-09-23 19:01:46 -0400 |
commit | 8165428610446ea9e6aa9dfa5485ab78e58cc9fc (patch) | |
tree | c410ad0f802abd86461a04ea7a4f552447e3ed03 /drivers/s390/scsi/zfcp_erp.c | |
parent | 2abbe866c8eb0296e3f5343bcf73e5371522a738 (diff) |
[SCSI] zfcp: fix: avoid removal of fsf reqs before qdio queues are down
Fix the fix ... One of my previous fixes introduced removal of all fsf
requests in zfcp's eh_host_reset_handler. But this must not happen
before qdio queues are shut down. So, I revert the changes of
zfcp_scsi_eh_host_reset_handler.
Signed-off-by: Andreas Herrmann <aherrman@de.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@SteelEye.com>
Diffstat (limited to 'drivers/s390/scsi/zfcp_erp.c')
-rw-r--r-- | drivers/s390/scsi/zfcp_erp.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/s390/scsi/zfcp_erp.c b/drivers/s390/scsi/zfcp_erp.c index af42a0eadf03..862a411a4aa0 100644 --- a/drivers/s390/scsi/zfcp_erp.c +++ b/drivers/s390/scsi/zfcp_erp.c | |||
@@ -91,6 +91,7 @@ static int zfcp_erp_unit_strategy_clearstati(struct zfcp_unit *); | |||
91 | static int zfcp_erp_unit_strategy_close(struct zfcp_erp_action *); | 91 | static int zfcp_erp_unit_strategy_close(struct zfcp_erp_action *); |
92 | static int zfcp_erp_unit_strategy_open(struct zfcp_erp_action *); | 92 | static int zfcp_erp_unit_strategy_open(struct zfcp_erp_action *); |
93 | 93 | ||
94 | static void zfcp_erp_action_dismiss_adapter(struct zfcp_adapter *); | ||
94 | static void zfcp_erp_action_dismiss_port(struct zfcp_port *); | 95 | static void zfcp_erp_action_dismiss_port(struct zfcp_port *); |
95 | static void zfcp_erp_action_dismiss_unit(struct zfcp_unit *); | 96 | static void zfcp_erp_action_dismiss_unit(struct zfcp_unit *); |
96 | static void zfcp_erp_action_dismiss(struct zfcp_erp_action *); | 97 | static void zfcp_erp_action_dismiss(struct zfcp_erp_action *); |
@@ -3157,7 +3158,7 @@ zfcp_erp_action_cleanup(int action, struct zfcp_adapter *adapter, | |||
3157 | } | 3158 | } |
3158 | 3159 | ||
3159 | 3160 | ||
3160 | void zfcp_erp_action_dismiss_adapter(struct zfcp_adapter *adapter) | 3161 | static void zfcp_erp_action_dismiss_adapter(struct zfcp_adapter *adapter) |
3161 | { | 3162 | { |
3162 | struct zfcp_port *port; | 3163 | struct zfcp_port *port; |
3163 | 3164 | ||