---

yaml
---
r: 204799
b: refs/heads/master
c: 6c99a85
h: refs/heads/master
i:
  204797: 78149d9
  204795: 638a508
  204791: 4141772
  204783: c00efef
  204767: c0e3599
  204735: c9eb7e7
  204671: 179fa34
  204543: edb436f
  204287: 90ad073
  203775: 2250b59
  202751: 09c99c4
  200703: 6a55196
  196607: 01bac5e
v: v3

[refs]

@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a5eb9e4ff18a33e43557d44b205f953b0c1efade
+refs/heads/master: 6c99a8528f9a81dda6bbbf83854b8475ce79c745

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.
 	 */