s390: revert dasd eer module
Subsystems (2)
PATCH 3/3 s390: revert dasd eer module
From: Heiko Carstens <[email protected]>
Revert dasd eer module until we have a common understanding of how the interface should be.
Signed-off-by Heiko Carstens <[email protected]>
---
drivers/s390/block/Kconfig | 14 drivers/s390/block/Makefile | 2 drivers/s390/block/dasd.c | 76 -- drivers/s390/block/dasd_3990_erp.c | 3 drivers/s390/block/dasd_eckd.h | 1 drivers/s390/block/dasd_eer.c | 1090 ------------------------------------- drivers/s390/block/dasd_int.h | 37 - include/asm-s390/dasd.h | 13 8 files changed, 5 insertions(+), 1231 deletions(-)
drivers/s390/block/Kconfig +3 -11
@@ -55,21 +55,13 @@ config DASD_DIAG Disks under VM. If you are not running under VM or unsure what it is, say "N". -config DASD_EER - tristate "Extended error reporting (EER)" - depends on DASD - help - This driver provides a character device interface to the - DASD extended error reporting. This is only needed if you want to - use applications written for the EER facility. - config DASD_CMB tristate "Compatibility interface for DASD channel measurement blocks" depends on DASD help - This driver provides an additional interface to the channel - measurement facility, which is normally accessed though sysfs, with - a set of ioctl functions specific to the dasd driver. + This driver provides an additional interface to the channel measurement + facility, which is normally accessed though sysfs, with a set of + ioctl functions specific to the dasd driver. This is only needed if you want to use applications written for linux-2.4 dasd channel measurement facility interface.
drivers/s390/block/Makefile +0 -2
@@ -5,7 +5,6 @@ dasd_eckd_mod-objs := dasd_eckd.o dasd_3990_erp.o dasd_9343_erp.o dasd_fba_mod-objs := dasd_fba.o dasd_3370_erp.o dasd_9336_erp.o dasd_diag_mod-objs := dasd_diag.o -dasd_eer_mod-objs := dasd_eer.o dasd_mod-objs := dasd.o dasd_ioctl.o dasd_proc.o dasd_devmap.o \ dasd_genhd.o dasd_erp.o
@@ -14,6 +13,5 @@ obj-$(CONFIG_DASD_DIAG) += dasd_diag_mod obj-$(CONFIG_DASD_ECKD) += dasd_eckd_mod.o obj-$(CONFIG_DASD_FBA) += dasd_fba_mod.o obj-$(CONFIG_DASD_CMB) += dasd_cmb.o -obj-$(CONFIG_DASD_EER) += dasd_eer.o obj-$(CONFIG_BLK_DEV_XPRAM) += xpram.o obj-$(CONFIG_DCSSBLK) += dcssblk.o
drivers/s390/block/dasd.c +1 -75
130 lines not on this page · raw message
drivers/s390/block/dasd_3990_erp.c +0 -3
@@ -1108,9 +1108,6 @@ dasd_3990_handle_env_data(struct dasd_cccase 0x0B :DEV_MESSAGE (KERN_WARNING , device,"%s" ,"FORMAT F - Volume is suspended duplex" ); -/* call extended error reporting (EER) */ -dasd_write_eer_trigger (DASD_EER_PPRCSUSPEND , device, - erp->refers);break ;case 0x0C : DEV_MESSAGE(KERN_WARNING, device, "%s",
drivers/s390/block/dasd_eckd.h +0 -1
@@ -29,7 +29,6 @@#define DASD_ECKD_CCW_PSF 0x27#define DASD_ECKD_CCW_RSSD 0x3e#define DASD_ECKD_CCW_LOCATE_RECORD 0x47 -#define DASD_ECKD_CCW_SNSS 0x54#define DASD_ECKD_CCW_DEFINE_EXTENT 0x63#define DASD_ECKD_CCW_WRITE_MT 0x85#define DASD_ECKD_CCW_READ_MT 0x86
drivers/s390/block/dasd_eer.c +0 -1090
1,090 lines not on this page · raw message
drivers/s390/block/dasd_int.h +0 -37
@@ -275,34 +275,6 @@ struct dasd_discipline {extern struct dasd_discipline *dasd_diag_discipline_pointer; - -/* -* Notification numbers for extended error reporting notifications: -* The DASD_EER_DISABLE notification is sent before a dasd_device (and it's -* eer pointer) is freed. The error reporting module needs to do all necessary -* cleanup steps. -* The DASD_EER_TRIGGER notification sends the actual error reports (triggers). -*/ -#define DASD_EER_DISABLE 0 -#define DASD_EER_TRIGGER 1 - -/* Trigger IDs for extended error reporting DASD_EER_TRIGGER notification */ -#define DASD_EER_FATALERROR 1 -#define DASD_EER_NOPATH 2 -#define DASD_EER_STATECHANGE 3 -#define DASD_EER_PPRCSUSPEND 4 - -/* -* The dasd_eer_trigger structure contains all data that we need to send -* along with an DASD_EER_TRIGGER notification. -*/ -struct dasd_eer_trigger { -unsigned int id; -struct dasd_device *device; -struct dasd_ccw_req *cqr; -}; - -struct dasd_device {/* Block device stuff. */ struct gendisk *gdp;
@@ -316,9 +288,6 @@ struct dasd_device {unsigned long flags;/* per device flags */ unsigned short features;/* copy of devmap-features (read-only!) */ -/* extended error reporting stuff (eer) */ -void *eer; -/* Device discipline stuff. */ struct dasd_discipline *discipline;struct dasd_discipline *base_discipline;
@@ -520,12 +489,6 @@ int dasd_generic_set_online(struct ccw_dint dasd_generic_set_offline (struct ccw_device *cdev);int dasd_generic_notify (struct ccw_device *,int );void dasd_generic_auto_online (struct ccw_driver *); -int dasd_register_eer_notifier (struct notifier_block *); -int dasd_unregister_eer_notifier (struct notifier_block *); -void dasd_write_eer_trigger (unsigned int ,struct dasd_device *, -struct dasd_ccw_req *); - -/* externals in dasd_devmap.c */ extern int dasd_max_devindex;
include/asm-s390/dasd.h +1 -12
@@ -204,8 +204,7 @@ typedef struct attrib_data_t {* * Here ist how the ioctl-nr should be used: * 0 - 31 DASD driver itself -* 32 - 229 still open -* 230 - 239 DASD extended error reporting +* 32 - 239 still open * 240 - 255 reserved for EMC *******************************************************************************/
@@ -237,22 +236,12 @@ typedef struct attrib_data_t {#define BIODASDPSRD _IOR(DASD_IOCTL_LETTER,4,dasd_rssd_perf_stats_t)/* Get Attributes (cache operations) */ #define BIODASDGATTR _IOR(DASD_IOCTL_LETTER,5,attrib_data_t) -/* retrieve extended error-reporting value */ -#define BIODASDEERGET _IOR(DASD_IOCTL_LETTER,6,int)/* #define BIODASDFORMAT _IOW(IOCTL_LETTER,0,format_data_t) , deprecated */ #define BIODASDFMT _IOW(DASD_IOCTL_LETTER,1,format_data_t)/* Set Attributes (cache operations) */ #define BIODASDSATTR _IOW(DASD_IOCTL_LETTER,2,attrib_data_t) -/* retrieve extended error-reporting value */ -#define BIODASDEERSET _IOW(DASD_IOCTL_LETTER,3,int) - - -/* remove all records from the eer buffer */ -#define DASD_EER_PURGE _IO(DASD_IOCTL_LETTER,230) -/* set the number of pages that are used for the internal eer buffer */ -#define DASD_EER_SETBUFSIZE _IOW(DASD_IOCTL_LETTER,230,int)#endif /* DASD_H */