git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
This commit was manufactured by cvs2svn to create tag
[linux-2.6.git]
/
drivers
/
s390
/
scsi
/
zfcp_ccw.c
diff --git
a/drivers/s390/scsi/zfcp_ccw.c
b/drivers/s390/scsi/zfcp_ccw.c
index
c509c13
..
84a5e37
100644
(file)
--- a/
drivers/s390/scsi/zfcp_ccw.c
+++ b/
drivers/s390/scsi/zfcp_ccw.c
@@
-26,13
+26,9
@@
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
* Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
*/
-#define ZFCP_CCW_C_REVISION "$Revision: 1.5
2
$"
+#define ZFCP_CCW_C_REVISION "$Revision: 1.5
5
$"
-#include <linux/init.h>
-#include <linux/module.h>
-#include <asm/ccwdev.h>
#include "zfcp_ext.h"
#include "zfcp_ext.h"
-#include "zfcp_def.h"
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
#define ZFCP_LOG_AREA ZFCP_LOG_AREA_CONFIG
@@
-232,14
+228,19
@@
zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
case CIO_GONE:
ZFCP_LOG_NORMAL("adapter %s: device gone\n",
zfcp_get_busid_by_adapter(adapter));
case CIO_GONE:
ZFCP_LOG_NORMAL("adapter %s: device gone\n",
zfcp_get_busid_by_adapter(adapter));
+ debug_text_event(adapter->erp_dbf,1,"dev_gone");
+ zfcp_erp_adapter_shutdown(adapter, 0);
break;
case CIO_NO_PATH:
ZFCP_LOG_NORMAL("adapter %s: no path\n",
zfcp_get_busid_by_adapter(adapter));
break;
case CIO_NO_PATH:
ZFCP_LOG_NORMAL("adapter %s: no path\n",
zfcp_get_busid_by_adapter(adapter));
+ debug_text_event(adapter->erp_dbf,1,"no_path");
+ zfcp_erp_adapter_shutdown(adapter, 0);
break;
case CIO_OPER:
ZFCP_LOG_NORMAL("adapter %s: operational again\n",
zfcp_get_busid_by_adapter(adapter));
break;
case CIO_OPER:
ZFCP_LOG_NORMAL("adapter %s: operational again\n",
zfcp_get_busid_by_adapter(adapter));
+ debug_text_event(adapter->erp_dbf,1,"dev_oper");
zfcp_erp_modify_adapter_status(adapter,
ZFCP_STATUS_COMMON_RUNNING,
ZFCP_SET);
zfcp_erp_modify_adapter_status(adapter,
ZFCP_STATUS_COMMON_RUNNING,
ZFCP_SET);
@@
-247,6
+248,7
@@
zfcp_ccw_notify(struct ccw_device *ccw_device, int event)
ZFCP_STATUS_COMMON_ERP_FAILED);
break;
}
ZFCP_STATUS_COMMON_ERP_FAILED);
break;
}
+ zfcp_erp_wait(adapter);
up(&zfcp_data.config_sema);
return 1;
}
up(&zfcp_data.config_sema);
return 1;
}