* [PATCH] virtio_blk: remove BKL leftovers
@ 2010-09-14 23:27 Christoph Hellwig
2010-09-15 8:50 ` Arnd Bergmann
2010-09-16 5:52 ` Rusty Russell
0 siblings, 2 replies; 3+ messages in thread
From: Christoph Hellwig @ 2010-09-14 23:27 UTC (permalink / raw)
To: rusty; +Cc: arnd, linux-kernel
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 <hch@lst.de>
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 <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 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)
{
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] virtio_blk: remove BKL leftovers
2010-09-14 23:27 [PATCH] virtio_blk: remove BKL leftovers Christoph Hellwig
@ 2010-09-15 8:50 ` Arnd Bergmann
2010-09-16 5:52 ` Rusty Russell
1 sibling, 0 replies; 3+ messages in thread
From: Arnd Bergmann @ 2010-09-15 8:50 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: rusty, linux-kernel
On Wednesday 15 September 2010, Christoph Hellwig wrote:
> 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 <hch@lst.de>
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
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] virtio_blk: remove BKL leftovers
2010-09-14 23:27 [PATCH] virtio_blk: remove BKL leftovers Christoph Hellwig
2010-09-15 8:50 ` Arnd Bergmann
@ 2010-09-16 5:52 ` Rusty Russell
1 sibling, 0 replies; 3+ messages in thread
From: Rusty Russell @ 2010-09-16 5:52 UTC (permalink / raw)
To: Christoph Hellwig; +Cc: arnd, linux-kernel
On Wed, 15 Sep 2010 08:57:23 am Christoph Hellwig wrote:
> 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 <hch@lst.de>
Applied,
Thanks!
Rusty.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2010-09-16 5:53 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-09-14 23:27 [PATCH] virtio_blk: remove BKL leftovers Christoph Hellwig
2010-09-15 8:50 ` Arnd Bergmann
2010-09-16 5:52 ` Rusty Russell
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox