diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2010-07-07 16:51:26 +0200 |
|---|---|---|
| committer | Jens Axboe <jaxboe@fusionio.com> | 2010-08-07 18:26:08 +0200 |
| commit | 62c2a7d969f30163f733c81158254b3095b23e72 (patch) | |
| tree | 3e5dd79d874b996757814562b874a18415599a61 /block/ioctl.c | |
| parent | block: push down BKL into .open and .release (diff) | |
| download | linux-62c2a7d969f30163f733c81158254b3095b23e72.tar.xz linux-62c2a7d969f30163f733c81158254b3095b23e72.zip | |
block: push BKL into blktrace ioctls
The blktrace driver currently needs the BKL, but
we should not need to take that in the block layer,
so just push it down into the driver itself.
It is quite likely that the BKL is not actually
required in blktrace code and could be removed
in a follow-on patch.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Acked-by: Christoph Hellwig <hch@infradead.org>
Signed-off-by: Jens Axboe <jaxboe@fusionio.com>
Diffstat (limited to 'block/ioctl.c')
| -rw-r--r-- | block/ioctl.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/block/ioctl.c b/block/ioctl.c index 1cfa8d449d90..9d91e830b320 100644 --- a/block/ioctl.c +++ b/block/ioctl.c @@ -320,9 +320,7 @@ int blkdev_ioctl(struct block_device *bdev, fmode_t mode, unsigned cmd, case BLKTRACESTOP: case BLKTRACESETUP: case BLKTRACETEARDOWN: - lock_kernel(); ret = blk_trace_ioctl(bdev, cmd, (char __user *) arg); - unlock_kernel(); break; default: ret = __blkdev_driver_ioctl(bdev, mode, cmd, arg); |