s390 (5/10): dasd driver fixes.
Subsystems (2)
PATCH 1/1 s390 (5/10): dasd driver fixes.
dasd driver fixes:
- Remove additional dasd attributes for a ccw-device if the discipline (=driver) gets unloaded.
- Fix race of dasd_generic_offline against dasd_open.
- Remove irq_exit calls from diag interrupt handler. The irq_enter/ irq_exit is done in the external interrupt handler.
diffstat:
drivers/s390/block/Kconfig | 8 +++--- drivers/s390/block/dasd.c | 49 +++++++++++++++++++++++++++++++-------- drivers/s390/block/dasd_devmap.c | 9 ++++++- drivers/s390/block/dasd_diag.c | 4 --- drivers/s390/block/dasd_int.h | 4 ++- 5 files changed, 55 insertions(+), 19 deletions(-)
drivers/s390/block/Kconfig +4 -4
@@ -48,12 +48,12 @@ say "Y". config DASD_DIAG - tristate "Support for DIAG access to CMS reserved Disks" + tristate "Support for DIAG access to Disks" depends on DASD && ARCH_S390X = 'n' help - Select this option if you want to use CMS reserved Disks under VM - with the Diagnose250 command. If you are not running under VM or - unsure what it is, say "N". + Select this option if you want to use Diagnose250 command to access + Disks under VM. If you are not running under VM or unsure what it is, + say "N". config DASD_CMB tristate "Compatibility interface for DASD channel measurement blocks"
drivers/s390/block/dasd.c +39 -10
98 lines not on this page · raw message
drivers/s390/block/dasd_devmap.c +8 -1
@@ -11,7 +11,7 @@* functions may not be called from interrupt context. In particular * dasd_get_device is a no-no from interrupt context. * -* $Revision: 1.25 $ +* $Revision: 1.26 $ */ #include <linux/config.h>
@@ -681,6 +681,13 @@return sysfs_create_group (&cdev->dev.kobj, &dasd_attr_group); } +void +dasd_remove_sysfs_files (struct ccw_device *cdev) +{ +sysfs_remove_group (&cdev->dev.kobj, &dasd_attr_group); +} + +int dasd_devmap_init (void ) {
drivers/s390/block/dasd_diag.c +1 -3
@@ -6,7 +6,7 @@* Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * -* $Revision: 1.33 $ +* $Revision: 1.34 $ */ #include <linux/config.h>
@@ -173,7 +173,6 @@if (!ip) {/* no intparm: unsolicited interrupt */ MESSAGE (KERN_DEBUG ,"%s" ,"caught unsolicited interrupt" ); -irq_exit ();return ; } cqr = (struct dasd_ccw_req *)(addr_t ) ip;
@@ -183,7 +182,6 @@" magic number of dasd_ccw_req 0x%08X doesn't" " match discipline 0x%08X" , cqr->magic, *(int *) (&device->discipline->name)); -irq_exit ();return ; }
drivers/s390/block/dasd_int.h +3 -1
@@ -6,7 +6,7 @@* Bugreports.to..: <[email protected]> * (C) IBM Corporation, IBM Deutschland Entwicklung GmbH, 1999,2000 * -* $Revision: 1.54 $ +* $Revision: 1.55 $ */ #ifndef DASD_INT_H
@@ -485,6 +485,8 @@void dasd_delete_device (struct dasd_device *);int dasd_add_sysfs_files (struct ccw_device *); +void dasd_remove_sysfs_files (struct ccw_device *); +struct dasd_device *dasd_device_from_cdev (struct ccw_device *);struct dasd_device *dasd_device_from_devindex (int );