Subject: virtio_blk: remove BKL leftovers Date: Wed, 15 Sep 2010 01:27:23 +0200 From: Christoph Hellwig Remove the BKL usage added in "block: push down BKL into .locked_ioctl". Virtio-blk doesn't use the BKL for anything, and doesn't implement any ioctl command by itself, but only uses the generic scsi_cmd_ioctl which is fine without the BKL. Signed-off-by: Christoph Hellwig Signed-off-by: Rusty Russell --- drivers/block/virtio_blk.c | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) Index: linux-2.6/drivers/block/virtio_blk.c =================================================================== --- linux-2.6.orig/drivers/block/virtio_blk.c 2010-09-09 18:13:25.171253781 -0300 +++ linux-2.6/drivers/block/virtio_blk.c 2010-09-09 18:14:48.154266565 -0300 @@ -2,7 +2,6 @@ #include #include #include -#include #include #include #include @@ -218,8 +217,8 @@ static int virtblk_get_id(struct gendisk return blk_execute_rq(vblk->disk->queue, vblk->disk, req, false); } -static int virtblk_locked_ioctl(struct block_device *bdev, fmode_t mode, - unsigned cmd, unsigned long data) +static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, + unsigned int cmd, unsigned long data) { struct gendisk *disk = bdev->bd_disk; struct virtio_blk *vblk = disk->private_data; @@ -234,18 +233,6 @@ static int virtblk_locked_ioctl(struct b (void __user *)data); } -static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, - unsigned int cmd, unsigned long param) -{ - int ret; - - lock_kernel(); - ret = virtblk_locked_ioctl(bdev, mode, cmd, param); - unlock_kernel(); - - return ret; -} - /* We provide getgeo only to please some old bootloader/partitioning tools */ static int virtblk_getgeo(struct block_device *bd, struct hd_geometry *geo) {