lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

block: push down BKL into .locked_ioctl

Browse Source 
As a preparation for the removal of the big kernel
lock in the block layer, this removes the BKL
from the common ioctl handling code, moving it
into every single driver still using it.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
This commit is contained in:
Arnd Bergmann
2010-07-08 10:18:46 +02:00
committed by Jens Axboe
parent 3448406244
commit 8a6cfeb6de
30 changed files with 253 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
drivers/cdrom/viocd.c
View File

@ -42,6 +42,7 @@
#include <linux/module.h>
#include <linux/completion.h>
#include <linux/proc_fs.h>
#include <linux/smp_lock.h>
#include <linux/seq_file.h>
#include <linux/scatterlist.h>
@ -167,7 +168,13 @@ static int viocd_blk_ioctl(struct block_device *bdev, fmode_t mode,
unsigned cmd, unsigned long arg)
{
struct disk_info *di = bdev->bd_disk->private_data;
return cdrom_ioctl(&di->viocd_info, bdev, mode, cmd, arg);
int ret;
lock_kernel();
ret = cdrom_ioctl(&di->viocd_info, bdev, mode, cmd, arg);
unlock_kernel();
return ret;
}
static int viocd_blk_media_changed(struct gendisk *disk)
@ -180,7 +187,7 @@ static const struct block_device_operations viocd_fops = {
.owner = THIS_MODULE,
.open = viocd_blk_open,
.release = viocd_blk_release,
.locked_ioctl = viocd_blk_ioctl,
.ioctl = viocd_blk_ioctl,
.media_changed = viocd_blk_media_changed,
};