From 4254291177125fd82f9c8a477e8645589a09ce0a Mon Sep 17 00:00:00 2001 From: john cooper Date: Thu, 25 Mar 2010 01:34:02 -0400 Subject: [PATCH] --- yaml --- r: 197850 b: refs/heads/master c: 234f2725a5d03f78539f1d36cb32f2c4f9b1822c h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/drivers/block/virtio_blk.c | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 343ee284cf92..46b9590c3f28 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4cb2ea28c55cf5e5ef83aec535099ffce3c583df +refs/heads/master: 234f2725a5d03f78539f1d36cb32f2c4f9b1822c diff --git a/trunk/drivers/block/virtio_blk.c b/trunk/drivers/block/virtio_blk.c index 759dee8330ac..67dcb193ab2e 100644 --- a/trunk/drivers/block/virtio_blk.c +++ b/trunk/drivers/block/virtio_blk.c @@ -225,6 +225,16 @@ 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 == '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. */