From 77a3bfc9b2bd0f8e7306833c600a4ee3673b44dc Mon Sep 17 00:00:00 2001 From: Ryan Harper Date: Wed, 23 Jun 2010 22:19:58 -0500 Subject: [PATCH] --- yaml --- r: 204799 b: refs/heads/master c: 6c99a8528f9a81dda6bbbf83854b8475ce79c745 h: refs/heads/master i: 204797: 78149d9825f32f992c48217ed5b540bda58cea51 204795: 638a50810bcfe68d4992e49b38de8eccab3c02f4 204791: 4141772b36492bfe26dd8b0c6128dba9684c0bfe 204783: c00efeff372b55a04119ac65e34aed1f65eb22d6 204767: c0e3599724c752fce84605fa7873592198b5c73c 204735: c9eb7e76ed684e103f9d0160fa22674144bd9edc 204671: 179fa34798512efa15728630ee4926870a4d653f 204543: edb436f7738aa0e38c5026bcdbf9e389be5284b5 204287: 90ad07384689ac5ffd52e259e653396552d6523d 203775: 2250b5950b01a05dbf21cc78aa4d615fd1d85066 202751: 09c99c4de5de2d56b5401c971b172d8f1a869e79 200703: 6a551968e42efdf2150d8ec1cd4f9729bcc23b4b 196607: 01bac5e5a8414a3908aa50d1e83fbc56ad7584c3 v: v3 --- [refs] | 2 +- trunk/drivers/block/virtio_blk.c | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/[refs] b/[refs] index c77b30853b4b..e5be5e77a120 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a5eb9e4ff18a33e43557d44b205f953b0c1efade +refs/heads/master: 6c99a8528f9a81dda6bbbf83854b8475ce79c745 diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c index 7a93b3f68849..23b7c48df843 100644 --- a/trunk/drivers/block/virtio_blk.c +++ b/trunk/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. */