virtio_blk: remove BKL leftovers
Subsystems (3)
PATCH 1/1 virtio_blk: remove BKL leftovers
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.
drivers/block/virtio_blk.c +2 -15
@@ -2,7 +2,6 @@#include <linux/spinlock.h> #include <linux/slab.h> #include <linux/blkdev.h> -#include <linux/smp_lock.h> #include <linux/hdreg.h> #include <linux/virtio.h> #include <linux/virtio_blk.h>
@@ -218,8 +217,8 @@ static int virtblk_get_id(struct gendiskreturn 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) {
Quoted 6 lines · 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_ioctlwhich is fine without the BKL.Signed-off-by Christoph Hellwig <[email protected]>
Looks good. Rusty, do you have a tree you want to stick this into? If not, I can add it to my 'config' series' and drop my other patch from the 'trivial' series.
Arnd
Rusty Russell
AppliedQuoted 6 lines · 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_ioctlwhich is fine without the BKL.Signed-off-by Christoph Hellwig <[email protected]>
Applied,
Thanks!
Rusty.