Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fe5a50a1 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Rusty Russell
Browse files

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.

Signed-off-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent 299fb61c

drivers/block/virtio_blk.c

+2 −15
Original line number Diff line number Diff line
@@ -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>
@@ -222,8 +221,8 @@ static int virtblk_get_id(struct gendisk *disk, char *id_str) 
	return err;

}



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;
@@ -238,18 +237,6 @@ static int virtblk_locked_ioctl(struct block_device *bdev, fmode_t mode, 
			      (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)

{