diff options
| author | Ryan Harper <ryanh@us.ibm.com> | 2010-06-23 22:19:58 -0500 |
|---|---|---|
| committer | Rusty Russell <rusty@rustcorp.com.au> | 2010-08-05 13:05:31 +0930 |
| commit | 6c99a8528f9a81dda6bbbf83854b8475ce79c745 (patch) | |
| tree | 0f73ab97e8dbefde81fbb43ebeef44f3a5e1b2d4 /drivers/block/virtio_blk.c | |
| parent | a5eb9e4ff18a33e43557d44b205f953b0c1efade (diff) | |
| download | linux-6c99a8528f9a81dda6bbbf83854b8475ce79c745.tar.gz linux-6c99a8528f9a81dda6bbbf83854b8475ce79c745.tar.bz2 linux-6c99a8528f9a81dda6bbbf83854b8475ce79c745.zip | |
virtio_blk: Remove VBID ioctl
With the availablility of a sysfs device attribute for examining disk serial
numbers the ioctl is no longer needed. The user-space changes for this aren't
upstream yet so we don't have any users to worry about.
Signed-off-by: Ryan Harper <ryanh@us.ibm.com>
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'drivers/block/virtio_blk.c')
| -rw-r--r-- | drivers/block/virtio_blk.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 7a93b3f68849..23b7c48df843 100644 --- a/drivers/block/virtio_blk.c +++ b/drivers/block/virtio_blk.c @@ -225,16 +225,6 @@ static int virtblk_ioctl(struct block_device *bdev, fmode_t mode, struct gendisk *disk = bdev->bd_disk; struct virtio_blk *vblk = disk->private_data; - if (cmd == 0x56424944) { /* 'VBID' */ - void __user *usr_data = (void __user *)data; - char id_str[VIRTIO_BLK_ID_BYTES]; - int err; - - err = virtblk_get_id(disk, id_str); - if (!err && copy_to_user(usr_data, id_str, VIRTIO_BLK_ID_BYTES)) - err = -EFAULT; - return err; - } /* * Only allow the generic SCSI ioctls if the host can support it. */ |