zfcp: minor erp bug fixes

PATCH New Andreas Herrmann 1 participant 1 message Aug 2, 2006

Subsystems (3)

SCSI s390 s390 zfcp driver

lore

Share & tools

lore

Andreas Herrmann

author

2006-08-02 09:09 UTC #0 lore raw

PATCH 2/3 zfcp: minor erp bug fixes

Bug fixes for zfcp's erp:
- trigger adapter reopen if do_QDIO fails
- avoid erp deadlock if registration of scsi target or remote port hang
- do not treat as error if exchange port data fails
- decrease timeout for target reset and aborts
- mark unit failed if slave_destroy is called

Additionally some code cleanup was done:
- made some functions void when retval is not of interest
- shortened initialization of zfcp's host_template
- corrected some comments

Signed-off-by Andreas Herrmann <[email protected]>

---
 drivers/s390/scsi/zfcp_def.h  |    2 
 drivers/s390/scsi/zfcp_erp.c  |  196 ++++++++++++++---------------------------
 drivers/s390/scsi/zfcp_ext.h  |    3 -
 drivers/s390/scsi/zfcp_scsi.c |   73 ++++++++-------
 4 files changed, 107 insertions(+), 167 deletions(-)

drivers/s390/scsi/zfcp_def.h +1 -1

index 72293f3..904d6a7 100644
@@ -80,7 +80,7 @@ zfcp_address_to_sg(void *address, struct
 #define REQUEST_LIST_SIZE 128
 
 /********************* SCSI SPECIFIC DEFINES *********************************/
-#define ZFCP_SCSI_ER_TIMEOUT                    (100*HZ)
+#define ZFCP_SCSI_ER_TIMEOUT                    (10*HZ)
 
 /********************* CIO/QDIO SPECIFIC DEFINES *****************************/

drivers/s390/scsi/zfcp_erp.c +67 ~~-129~~

361 lines not on this page · raw message

drivers/s390/scsi/zfcp_ext.h +2 -1

index 04bb3a9..146d7a2 100644
@@ -139,6 +139,7 @@ extern void zfcp_erp_modify_adapter_stat
 extern int  zfcp_erp_adapter_reopen(struct zfcp_adapter *, int);
 extern int  zfcp_erp_adapter_shutdown(struct zfcp_adapter *, int);
 extern void zfcp_erp_adapter_failed(struct zfcp_adapter *);
+extern void zfcp_erp_action_dismiss_adapter(struct zfcp_adapter *);
 
 extern void zfcp_erp_modify_port_status(struct zfcp_port *, u32, int);
 extern int  zfcp_erp_port_reopen(struct zfcp_port *, int);

@@ -155,7 +156,7 @@ extern void zfcp_erp_unit_failed(struct 
 extern int  zfcp_erp_thread_setup(struct zfcp_adapter *);
 extern int  zfcp_erp_thread_kill(struct zfcp_adapter *);
 extern int  zfcp_erp_wait(struct zfcp_adapter *);
-extern int  zfcp_erp_async_handler(struct zfcp_erp_action *, unsigned long);
+extern void zfcp_erp_async_handler(struct zfcp_erp_action *, unsigned long);
 
 extern int  zfcp_test_link(struct zfcp_port *);

drivers/s390/scsi/zfcp_scsi.c +37 ~~-36~~

123 lines not on this page · raw message

Signature · 1 line

1.4.2.rc2.gef1d9