From patchwork Thu Jun 24 03:19:58 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ryan Harper X-Patchwork-Id: 107751 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o5O3KuCX019232 for ; Thu, 24 Jun 2010 03:20:56 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754003Ab0FXDUO (ORCPT ); Wed, 23 Jun 2010 23:20:14 -0400 Received: from e5.ny.us.ibm.com ([32.97.182.145]:43650 "EHLO e5.ny.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753601Ab0FXDUF (ORCPT ); Wed, 23 Jun 2010 23:20:05 -0400 Received: from d01relay03.pok.ibm.com (d01relay03.pok.ibm.com [9.56.227.235]) by e5.ny.us.ibm.com (8.14.4/8.13.1) with ESMTP id o5O32rtr026118 for ; Wed, 23 Jun 2010 23:02:53 -0400 Received: from d01av02.pok.ibm.com (d01av02.pok.ibm.com [9.56.224.216]) by d01relay03.pok.ibm.com (8.13.8/8.13.8/NCO v10.0) with ESMTP id o5O3K4Eh133536 for ; Wed, 23 Jun 2010 23:20:04 -0400 Received: from d01av02.pok.ibm.com (loopback [127.0.0.1]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVout) with ESMTP id o5O3K3aY002131 for ; Thu, 24 Jun 2010 00:20:04 -0300 Received: from localhost.localdomain (sig-9-65-88-241.mts.ibm.com [9.65.88.241]) by d01av02.pok.ibm.com (8.14.4/8.13.1/NCO v10.0 AVin) with ESMTP id o5O3K0BJ001875; Thu, 24 Jun 2010 00:20:03 -0300 From: Ryan Harper To: virtualization@lists.linux-foundation.org Cc: Rusty Russell , john cooper , kvm@vger.kernel.org, qemu-devel@nongnu.org, Ryan Harper Subject: [PATCH 2/2] Remove virtio_blk VBID ioctl Date: Wed, 23 Jun 2010 22:19:58 -0500 Message-Id: <1277349598-24559-3-git-send-email-ryanh@us.ibm.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1277349598-24559-1-git-send-email-ryanh@us.ibm.com> References: <1277349598-24559-1-git-send-email-ryanh@us.ibm.com> Sender: kvm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: kvm@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 24 Jun 2010 03:20:56 +0000 (UTC) diff --git a/drivers/block/virtio_blk.c b/drivers/block/virtio_blk.c index 34411ff..04458cd 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. */