diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-05-31 22:38:40 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2010-09-26 16:25:51 +0200 |
| commit | cfdb00a77ea7d5fb922fd985e5dfbcb36873411b (patch) | |
| tree | d5b70c7edc95cad7271342214d3e4338f37e02c2 /drivers/s390/block/dasd_ioctl.c | |
| parent | 54066a57c584ee8ce767053116fc4943ed1168b5 (diff) | |
s390/block: kill the big kernel lock
The dasd and dcssblk drivers gained the big
kernel lock in the recent pushdown from the
block layer, but they don't really need it,
so remove the calls without a replacement.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Heiko Carstens <heiko.carstens@de.ibm.com>
Cc: linux-s390@vger.kernel.org
Diffstat (limited to 'drivers/s390/block/dasd_ioctl.c')
| -rw-r--r-- | drivers/s390/block/dasd_ioctl.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/drivers/s390/block/dasd_ioctl.c b/drivers/s390/block/dasd_ioctl.c index 1557214944f..26075e95b1b 100644 --- a/drivers/s390/block/dasd_ioctl.c +++ b/drivers/s390/block/dasd_ioctl.c @@ -16,7 +16,6 @@ #include <linux/major.h> #include <linux/fs.h> #include <linux/blkpg.h> -#include <linux/smp_lock.h> #include <linux/slab.h> #include <asm/compat.h> #include <asm/ccwdev.h> @@ -370,9 +369,8 @@ static int dasd_ioctl_readall_cmb(struct dasd_block *block, unsigned int cmd, return ret; } -static int -dasd_do_ioctl(struct block_device *bdev, fmode_t mode, - unsigned int cmd, unsigned long arg) +int dasd_ioctl(struct block_device *bdev, fmode_t mode, + unsigned int cmd, unsigned long arg) { struct dasd_block *block = bdev->bd_disk->private_data; void __user *argp; @@ -430,14 +428,3 @@ dasd_do_ioctl(struct block_device *bdev, fmode_t mode, return -EINVAL; } } - -int dasd_ioctl(struct block_device *bdev, fmode_t mode, - unsigned int cmd, unsigned long arg) -{ - int rc; - - lock_kernel(); - rc = dasd_do_ioctl(bdev, mode, cmd, arg); - unlock_kernel(); - return rc; -} |