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

Commit 6c99a852 authored by Ryan Harper's avatar Ryan Harper Committed by Rusty Russell
Browse files

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: default avatarRyan Harper <ryanh@us.ibm.com>
Signed-off-by: default avatarRusty Russell <rusty@rustcorp.com.au>
parent a5eb9e4f

drivers/block/virtio_blk.c

+0 −10
Original line number Diff line number Diff line
@@ -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.

	 */