Skip to contentSkip to conversation

s390: use normal switch statement for ioctls in dasd_ioctl.c.

PATCH In review Martin Schwidefsky 1 participant 1 message Mar 22, 2006

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 9/24 s390: use normal switch statement for ioctls in dasd_ioctl.c.

From: Christoph Hellwig <[email protected]>

[patch 9/24] s390: use normal switch statement for ioctls in dasd_ioctl.c.

Handle ioctls implemented in dasd_ioctl through the normal switch statement that most drivers use instead of the awkward
dasd_ioctl_no_register routine. This avoids searching a linear list
on every call to dasd_ioctl(), and allows to give the various ioctl implementation functions sane prototypes, aswell as moving the check for bdev->bd_disk->private_data from the individual functions to dasd_ioctl. (I think it can't actually every be NULL, but let's keep that for later)

---

 drivers/s390/block/dasd.c       |    4 
 drivers/s390/block/dasd_int.h   |    2 
 drivers/s390/block/dasd_ioctl.c |  241 ++++++++++++++--------------------------
 3 files changed, 86 insertions(+), 161 deletions(-)
drivers/s390/block/dasd.c +0 -4
diff -urpN linux-2.6/drivers/s390/block/dasd.c linux-2.6-patched/drivers/s390/block/dasd.c
@@ -1807,7 +1807,6 @@ dasd_exit(void)
 #ifdef CONFIG_PROC_FS
 	dasd_proc_exit();
 #endif
-	dasd_ioctl_exit();
         if (dasd_page_cache != NULL) {
 		kmem_cache_destroy(dasd_page_cache);
 		dasd_page_cache = NULL;
@@ -2093,9 +2092,6 @@ dasd_init(void)
 	rc = dasd_parse();
 	if (rc)
 		goto failed;
-	rc = dasd_ioctl_init();
-	if (rc)
-		goto failed;
 #ifdef CONFIG_PROC_FS
 	rc = dasd_proc_init();
 	if (rc)
drivers/s390/block/dasd_int.h +0 -2
diff -urpN linux-2.6/drivers/s390/block/dasd_int.h linux-2.6-patched/drivers/s390/block/dasd_int.h
@@ -523,8 +523,6 @@ int dasd_scan_partitions(struct dasd_dev
 void dasd_destroy_partitions(struct dasd_device *);
 
 /* externals in dasd_ioctl.c */
-int  dasd_ioctl_init(void);
-void dasd_ioctl_exit(void);
 int  dasd_ioctl_no_register(struct module *, int, dasd_ioctl_fn_t);
 int  dasd_ioctl_no_unregister(struct module *, int, dasd_ioctl_fn_t);
 int  dasd_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
drivers/s390/block/dasd_ioctl.c +86 -155

381 lines not on this page · raw message