xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects 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

22
drivers/message/i2o/i2o_block.c
View File

@@ -53,7 +53,6 @@
#include <linux/module.h>
#include <linux/slab.h>
#include <linux/i2o.h>
#include <linux/smp_lock.h>
#include <linux/mempool.h>
@@ -653,40 +652,30 @@ static int i2o_block_ioctl(struct block_device *bdev, fmode_t mode,
{
struct gendisk *disk = bdev->bd_disk;
struct i2o_block_device *dev = disk->private_data;
int ret = -ENOTTY;
/* Anyone capable of this syscall can do *real bad* things */
if (!capable(CAP_SYS_ADMIN))
return -EPERM;
lock_kernel();
switch (cmd) {
case BLKI2OGRSTRAT:
ret = put_user(dev->rcache, (int __user *)arg);
break;
return put_user(dev->rcache, (int __user *)arg);
case BLKI2OGWSTRAT:
ret = put_user(dev->wcache, (int __user *)arg);
break;
return put_user(dev->wcache, (int __user *)arg);
case BLKI2OSRSTRAT:
ret = -EINVAL;
if (arg < 0 || arg > CACHE_SMARTFETCH)
break;
return -EINVAL;
dev->rcache = arg;
ret = 0;
break;
case BLKI2OSWSTRAT:
ret = -EINVAL;
if (arg != 0
&& (arg < CACHE_WRITETHROUGH || arg > CACHE_SMARTBACK))
break;
return -EINVAL;
dev->wcache = arg;
ret = 0;
break;
}
unlock_kernel();
return ret;
return -ENOTTY;
};
/**
@@ -942,7 +931,6 @@ static const struct block_device_operations i2o_block_fops = {
.open = i2o_block_open,
.release = i2o_block_release,
.ioctl = i2o_block_ioctl,
.compat_ioctl = i2o_block_ioctl,
.getgeo = i2o_block_getgeo,
.media_changed = i2o_block_media_changed
};